From fb77d903dc7d24d32d6734254dbf0e5b07df2b10 Mon Sep 17 00:00:00 2001
From: amazzini <andrea.mazzini@nokia.com>
Date: Wed, 3 Jun 2020 16:02:24 +0200
Subject: [PATCH 1/6] PhotonicMedia model enhancements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See "2020-05-04/08 TAPI Virtual Meeting Agenda and Notes", Wed 6/P3

Other minor diagram adjustments
(TapiCommon.uml “visibility” on LayerProtocolQualifier, no actual
changes)
---
 UML/TapiCommon.notation        |  125 +-
 UML/TapiCommon.uml             |    2 +-
 UML/TapiOdu.notation           | 1391 +++++++------
 UML/TapiPhotonicMedia.notation | 3489 ++++++++++++++++++--------------
 UML/TapiPhotonicMedia.uml      |  134 +-
 UML/TapiTopology.notation      |  554 ++---
 6 files changed, 3187 insertions(+), 2508 deletions(-)

diff --git a/UML/TapiCommon.notation b/UML/TapiCommon.notation
index 5f924661..0ce8665a 100644
--- a/UML/TapiCommon.notation
+++ b/UML/TapiCommon.notation
@@ -727,53 +727,53 @@
       <element xmi:type="uml:Enumeration" href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-exDkYk2Eeil5oKL3Vgl-g" x="180" y="143"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qZktwG9LEeqLWtFsc04LIg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qZktwW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qZktw29LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Kt-EkKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Kt-EkaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Kt-Ek6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:DataType" href="TapiCommon.uml#_FRi-QNnWEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qZktwm9LEeqLWtFsc04LIg" x="240" y="351"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kt-EkqBUEeqPrpdMOOTlbQ" x="240" y="351"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qaIucG9LEeqLWtFsc04LIg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qaIucW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qaIuc29LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_KvZA4KBUEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KvZA4aBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KvZA46BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_adPI0NnqEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qaIucm9LEeqLWtFsc04LIg" x="920" y="154"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KvZA4qBUEeqPrpdMOOTlbQ" x="920" y="154"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qagh4G9LEeqLWtFsc04LIg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qagh4W9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qagh429LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_KzfdwKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KzfdwaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Kzfdw6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_2wdyENnjEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qagh4m9LEeqLWtFsc04LIg" x="542" y="7"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KzfdwqBUEeqPrpdMOOTlbQ" x="542" y="7"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qa6xkG9LEeqLWtFsc04LIg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qa6xkW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qa6xk29LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_K0390KBUEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0390aBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K03906BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_pGsZEN5qEeWd9KDn6x5Skg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qa6xkm9LEeqLWtFsc04LIg" x="797" y="146"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0390qBUEeqPrpdMOOTlbQ" x="797" y="146"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qbFwsG9LEeqLWtFsc04LIg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qbFwsW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qbFws29LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_K1ZiQKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K1ZiQaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K1ZiQ6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_i92HIL6PEeWRz-VHgA3LJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qbFwsm9LEeqLWtFsc04LIg" x="219" y="140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K1ZiQqBUEeqPrpdMOOTlbQ" x="219" y="140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qdCRcG9LEeqLWtFsc04LIg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qdCRcW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qdCRc29LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LAvPkKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LAvPkaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LAvPk6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qdCRcm9LEeqLWtFsc04LIg" x="380" y="143"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LAvPkqBUEeqPrpdMOOTlbQ" x="380" y="143"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_6CIXQTA_Eea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_6CIXQjA_Eea4fKwSGMr6CA"/>
@@ -781,65 +781,65 @@
       <owner xmi:type="uml:Package" href="TapiCommon.uml#_XqBXAC5wEea0_JngOlSKcA"/>
     </styles>
     <element xmi:type="uml:Package" href="TapiCommon.uml#_XqBXAC5wEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_qZktxG9LEeqLWtFsc04LIg" type="StereotypeCommentLink" source="_9tz_FDA_Eea4fKwSGMr6CA" target="_qZktwG9LEeqLWtFsc04LIg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qZktxW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qZlU0m9LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Kt-roKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9tz_FDA_Eea4fKwSGMr6CA" target="_Kt-EkKBUEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Kt-roaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Kt-rpaBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:DataType" href="TapiCommon.uml#_FRi-QNnWEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qZktxm9LEeqLWtFsc04LIg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qZlU0G9LEeqLWtFsc04LIg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qZlU0W9LEeqLWtFsc04LIg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kt-roqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kt-ro6BUEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kt-rpKBUEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qaIudG9LEeqLWtFsc04LIg" type="StereotypeCommentLink" source="_9tz_uzA_Eea4fKwSGMr6CA" target="_qaIucG9LEeqLWtFsc04LIg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qaIudW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qaIueW9LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_KvZA5KBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9tz_uzA_Eea4fKwSGMr6CA" target="_KvZA4KBUEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_KvZA5aBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KvZA6aBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_adPI0NnqEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qaIudm9LEeqLWtFsc04LIg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qaIud29LEeqLWtFsc04LIg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qaIueG9LEeqLWtFsc04LIg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KvZA5qBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KvZA56BUEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KvZA6KBUEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qagh5G9LEeqLWtFsc04LIg" type="StereotypeCommentLink" source="_9t0ACTA_Eea4fKwSGMr6CA" target="_qagh4G9LEeqLWtFsc04LIg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qagh5W9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qahI8m9LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_KzfdxKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9t0ACTA_Eea4fKwSGMr6CA" target="_KzfdwKBUEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_KzfdxaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KzfdyaBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_2wdyENnjEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qagh5m9LEeqLWtFsc04LIg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qahI8G9LEeqLWtFsc04LIg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qahI8W9LEeqLWtFsc04LIg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KzfdxqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kzfdx6BUEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KzfdyKBUEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qa6xlG9LEeqLWtFsc04LIg" type="StereotypeCommentLink" source="_9t0AjjA_Eea4fKwSGMr6CA" target="_qa6xkG9LEeqLWtFsc04LIg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qa6xlW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qa6xmW9LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_K0391KBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9t0AjjA_Eea4fKwSGMr6CA" target="_K0390KBUEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_K0391aBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K0392aBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_pGsZEN5qEeWd9KDn6x5Skg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qa6xlm9LEeqLWtFsc04LIg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qa6xl29LEeqLWtFsc04LIg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qa6xmG9LEeqLWtFsc04LIg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K0391qBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K03916BUEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K0392KBUEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qbFwtG9LEeqLWtFsc04LIg" type="StereotypeCommentLink" source="_9t0AtDA_Eea4fKwSGMr6CA" target="_qbFwsG9LEeqLWtFsc04LIg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qbFwtW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qbFwuW9LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_K1ZiRKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9t0AtDA_Eea4fKwSGMr6CA" target="_K1ZiQKBUEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_K1ZiRaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K1ZiSaBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_i92HIL6PEeWRz-VHgA3LJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qbFwtm9LEeqLWtFsc04LIg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qbFwt29LEeqLWtFsc04LIg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qbFwuG9LEeqLWtFsc04LIg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K1ZiRqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K1ZiR6BUEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K1ZiSKBUEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qdCRdG9LEeqLWtFsc04LIg" type="StereotypeCommentLink" source="_-exDkIk2Eeil5oKL3Vgl-g" target="_qdCRcG9LEeqLWtFsc04LIg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qdCRdW9LEeqLWtFsc04LIg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qdCReW9LEeqLWtFsc04LIg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LAv2oKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_-exDkIk2Eeil5oKL3Vgl-g" target="_LAvPkKBUEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LAv2oaBUEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LAv2paBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qdCRdm9LEeqLWtFsc04LIg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qdCRd29LEeqLWtFsc04LIg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qdCReG9LEeqLWtFsc04LIg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LAv2oqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LAv2o6BUEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LAv2pKBUEeqPrpdMOOTlbQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_iE1WsD3fEea-1_BGg-qcjQ" type="PapyrusUMLClassDiagram" name="Context" measurementUnit="Pixel">
@@ -2443,8 +2443,5 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qa90GMZUEeeAD9H5zOiMUQ"/>
     </edges>
   </notation:Diagram>
-  <css:ModelStyleSheets xmi:id="_9sS7oG9LEeqLWtFsc04LIg">
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
-  </css:ModelStyleSheets>
+  <css:ModelStyleSheets xmi:id="_9sS7oG9LEeqLWtFsc04LIg"/>
 </xmi:XMI>
diff --git a/UML/TapiCommon.uml b/UML/TapiCommon.uml
index 3d3de64f..4ffb0cd4 100644
--- a/UML/TapiCommon.uml
+++ b/UML/TapiCommon.uml
@@ -622,7 +622,7 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fiaKsF6lEeitO-Stqhyn1g" value="5"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_-eq88Ik2Eeil5oKL3Vgl-g" name="LayerProtocolQualifier">
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_-eq88Ik2Eeil5oKL3Vgl-g" name="LayerProtocolQualifier" visibility="public">
         <ownedComment xmi:type="uml:Comment" xmi:id="_0n5PoIk3Eeil5oKL3Vgl-g" annotatedElement="_-eq88Ik2Eeil5oKL3Vgl-g">
           <body>This enumeration is used to qualify the sub-layers (if applicable) for a specific LayerProtocol.&#xD;
 This extensible enumeration is intentionally empty in the common module and will be augmented with layer-specific values in the respective technology-specific modules.&#xD;
diff --git a/UML/TapiOdu.notation b/UML/TapiOdu.notation
index 26c34d5e..fc51cea8 100644
--- a/UML/TapiOdu.notation
+++ b/UML/TapiOdu.notation
@@ -4310,197 +4310,213 @@
       <element xsi:nil="true"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LHYdooJZEeqLl4tIPv2RCg" x="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LJZP0IJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LJZ24IJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LJZ24oJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_LMK3AIJZEeqLl4tIPv2RCg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_LMK3AYJZEeqLl4tIPv2RCg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LMK3A4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_CJrDMDIOEeaBg9FoTfINnA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LMK3AoJZEeqLl4tIPv2RCg" x="-120" y="-54"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_17wxEImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_17wxEYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_17wxE4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_sYxiwR3BEea2UIYIpgn3Zw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_17wxEomCEeqL-oc9WWhEWw" x="240"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_1-yP4ImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_1-yP4YmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_1-yP44mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_sYxjIR3BEea2UIYIpgn3Zw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LJZ24YJZEeqLl4tIPv2RCg" x="256" y="-334"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1-yP4omCEeqL-oc9WWhEWw" x="256" y="-334"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LKZVYIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LKZVYYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LKZVY4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2AUg8ImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2AUg8YmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2AUg84mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Pk4cEGv3EeeuTqO16nt42g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LKZVYoJZEeqLl4tIPv2RCg" x="256" y="-434"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2AUg8omCEeqL-oc9WWhEWw" x="256" y="-434"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LKs3YIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LKs3YYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LKs3Y4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2AsUYImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2AsUYYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2AsUY4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_sYw7sR3BEea2UIYIpgn3Zw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LKs3YoJZEeqLl4tIPv2RCg" x="256" y="-434"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2AsUYomCEeqL-oc9WWhEWw" x="256" y="-434"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LK99IIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LK99IYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LK-kMIJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2BJAUImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2BJAUYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2BJAU4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_f4FBYI2vEeeyQ71bxGIq2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LK99IoJZEeqLl4tIPv2RCg" x="256" y="-434"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2BJAUomCEeqL-oc9WWhEWw" x="256" y="-434"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LLL_kIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LLL_kYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LLL_k4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2Bm6YImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2Bm6YYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2Bm6Y4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_dvFv0EeLEeetffGEmR5xrg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LLL_koJZEeqLl4tIPv2RCg" x="256" y="-434"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2Bm6YomCEeqL-oc9WWhEWw" x="256" y="-434"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LLdsYIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LLdsYYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LLdsY4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2CHQsImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2CHQsYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2CHQs4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_SHJxwJRKEee0N_ppE1lIiw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LLdsYoJZEeqLl4tIPv2RCg" x="256" y="-434"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2CHQsomCEeqL-oc9WWhEWw" x="256" y="-434"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LMK3AIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LMK3AYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LMK3A4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2DbfUImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2DbfUYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2DbfU4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_CJrDMDIOEeaBg9FoTfINnA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LMK3AoJZEeqLl4tIPv2RCg" x="-120" y="-54"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2DbfUomCEeqL-oc9WWhEWw" x="-120" y="-54"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LNgTwIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LNgTwYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LNg60IJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2FQEQImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2FQEQYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2FQEQ4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Um-Q8EKhEea-2Meh9kw1kA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LNgTwoJZEeqLl4tIPv2RCg" x="-52" y="-329"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2FQEQomCEeqL-oc9WWhEWw" x="-52" y="-329"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LONeYIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LONeYYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LOOFcIJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2GGY0ImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2GGY0YmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2GGY04mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_QeB5YBNJEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LONeYoJZEeqLl4tIPv2RCg" x="-52" y="-429"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2GGY0omCEeqL-oc9WWhEWw" x="-52" y="-429"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LOcu8IJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LOcu8YJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LOdWAIJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2GWQcImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2GWQcYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2GWQc4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_cOYiQDIOEeaBg9FoTfINnA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LOcu8oJZEeqLl4tIPv2RCg" x="-52" y="-429"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2GWQcomCEeqL-oc9WWhEWw" x="-52" y="-429"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LO-6cIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LO-6cYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LO-6c4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2G8GUImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2G8GUYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2G8GU4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LO-6coJZEeqLl4tIPv2RCg" x="-26" y="-469"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2G8GUomCEeqL-oc9WWhEWw" x="-26" y="-469"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LP78sIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LP78sYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LP78s4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2HqfEImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2HqfEYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2HqfE4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LP78soJZEeqLl4tIPv2RCg" x="369" y="-469"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2HqfEomCEeqL-oc9WWhEWw" x="369" y="-469"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LQ4X4IJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LQ4X4YJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LQ4X44JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2Ie-cImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2Ie-cYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2Ie-c4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_8TUjoEeKEeetffGEmR5xrg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LQ4X4oJZEeqLl4tIPv2RCg" x="780" y="60"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2Ie-comCEeqL-oc9WWhEWw" x="780" y="60"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LST7QIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LST7QYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LST7Q4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2J-MMImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2J-MMYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2J-MM4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_IHt9wEeWEeetffGEmR5xrg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LST7QoJZEeqLl4tIPv2RCg" x="-20" y="280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2J-MMomCEeqL-oc9WWhEWw" x="-20" y="280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LTiDQIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LTiDQYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LTiDQ4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2LaWoImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2LaWoYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2LaWo4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_MoTjcJRKEee0N_ppE1lIiw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LTiDQoJZEeqLl4tIPv2RCg" x="820" y="-240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2LaWoomCEeqL-oc9WWhEWw" x="820" y="-240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LVB4EIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LVB4EYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LVB4E4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2M3vMImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2M3vMYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2M3vM4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Dq-L0G-UEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LVB4EoJZEeqLl4tIPv2RCg" x="1360" y="-280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2M3vMomCEeqL-oc9WWhEWw" x="1360" y="-280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LVqKMIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LVqKMYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LVqxQIJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_2NpLQImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2NpLQYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2NpLQ4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_brN4wG-UEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LVqKMoJZEeqLl4tIPv2RCg" x="1360" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2NpLQomCEeqL-oc9WWhEWw" x="1360" y="-380"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LWWtwIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LWWtwYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LWWtw4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_2N30wImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2N30wYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2N4b0ImCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_nJmSMHNmEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LWWtwoJZEeqLl4tIPv2RCg" x="1460" y="-460"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2N30womCEeqL-oc9WWhEWw" x="1360" y="-380"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LXLNIIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LXLNIYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LXLNI4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_6cZ1EHNlEeq5_dSLunoRNA"/>
+    <children xsi:type="notation:Shape" xmi:id="_2OLWwImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2OLWwYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2OLWw4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_wf4sIHNmEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LXLNIoJZEeqLl4tIPv2RCg" x="1420" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2OLWwomCEeqL-oc9WWhEWw" x="1360" y="-380"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LYT1kIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LYT1kYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LYUcoIJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_68rQkHNlEeq5_dSLunoRNA"/>
+    <children xsi:type="notation:Shape" xmi:id="_2OjKMImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2OjKMYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2OjKM4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_umDiIHeXEeqNg6iBMTiyZw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LYT1koJZEeqLl4tIPv2RCg" x="1360" y="291"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2OjKMomCEeqL-oc9WWhEWw" x="1360" y="-380"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LZYzoIJZEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LZYzoYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LZYzo4JZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_g2mvkHeXEeqNg6iBMTiyZw"/>
+    <children xsi:type="notation:Shape" xmi:id="_2PNRgImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2PNRgYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2PNRg4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LZYzooJZEeqLl4tIPv2RCg" x="1500" y="-80"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2PNRgomCEeqL-oc9WWhEWw" x="1460" y="-460"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_uG8MQ4JjEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_uG8MRIJjEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_uG8zUIJjEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_umDiIHeXEeqNg6iBMTiyZw"/>
+    <children xsi:type="notation:Shape" xmi:id="_2P7qQImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2P7qQYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2P7qQ4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_6cZ1EHNlEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_uG8MRYJjEeqLl4tIPv2RCg" x="1360" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2P7qQomCEeqL-oc9WWhEWw" x="1420" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wz_oYIJjEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wz_oYYJjEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wz_oY4JjEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_nJmSMHNmEeq5_dSLunoRNA"/>
+    <children xsi:type="notation:Shape" xmi:id="_2Q_aMImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2Q_aMYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2Q_aM4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_68rQkHNlEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wz_oYoJjEeqLl4tIPv2RCg" x="1360" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2Q_aMomCEeqL-oc9WWhEWw" x="1360" y="291"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_yF9mk4JjEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_yF9mlIJjEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_yF9mloJjEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_wf4sIHNmEeq5_dSLunoRNA"/>
+    <children xsi:type="notation:Shape" xmi:id="_2R_fwImCEeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2R_fwYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2R_fw4mCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_g2mvkHeXEeqNg6iBMTiyZw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yF9mlYJjEeqLl4tIPv2RCg" x="1360" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2R_fwomCEeqL-oc9WWhEWw" x="1500" y="-80"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_sZDP5B3BEea2UIYIpgn3Zw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_sZDP5R3BEea2UIYIpgn3Zw"/>
@@ -7009,245 +7025,265 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LHZEtIJZEeqLl4tIPv2RCg"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LHZEtYJZEeqLl4tIPv2RCg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LJZ244JZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_sY0nGx3BEea2UIYIpgn3Zw" target="_LJZP0IJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LJZ25IJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LJZ26IJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_LMLeEIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_C8QWsDIOEeaBg9FoTfINnA" target="_LMK3AIJZEeqLl4tIPv2RCg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_LMLeEYJZEeqLl4tIPv2RCg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LMLeFYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_CJrDMDIOEeaBg9FoTfINnA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LMLeEoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LMLeE4JZEeqLl4tIPv2RCg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LMLeFIJZEeqLl4tIPv2RCg"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_17wxFImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_sYz_AR3BEea2UIYIpgn3Zw" target="_17wxEImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_17wxFYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_17wxGYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_sYxiwR3BEea2UIYIpgn3Zw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_17wxFomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_17wxF4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_17wxGImCEeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_1-yP5ImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_sY0nGx3BEea2UIYIpgn3Zw" target="_1-yP4ImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_1-yP5YmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_1-yP6YmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_sYxjIR3BEea2UIYIpgn3Zw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LJZ25YJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LJZ25oJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LJZ254JZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1-yP5omCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1-yP54mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1-yP6ImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LKZVZIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_Po3kMGv3EeeuTqO16nt42g" target="_LKZVYIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LKZVZYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LKZVaYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2AUg9ImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_Po3kMGv3EeeuTqO16nt42g" target="_2AUg8ImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2AUg9YmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2AUg-YmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Pk4cEGv3EeeuTqO16nt42g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LKZVZoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LKZVZ4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LKZVaIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2AUg9omCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2AUg94mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2AUg-ImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LKs3ZIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_de_qIIuXEeiu6boZkiJHCA" target="_LKs3YIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LKs3ZYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LKs3aYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2AsUZImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_de_qIIuXEeiu6boZkiJHCA" target="_2AsUYImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2AsUZYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2As7comCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_sYw7sR3BEea2UIYIpgn3Zw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LKs3ZoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LKs3Z4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LKs3aIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2AsUZomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2As7cImCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2As7cYmCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LK-kMYJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_f2dQwIuXEeiu6boZkiJHCA" target="_LK99IIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LK-kMoJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LK-kNoJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2BJAVImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_f2dQwIuXEeiu6boZkiJHCA" target="_2BJAUImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2BJAVYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2BJnYomCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_f4FBYI2vEeeyQ71bxGIq2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LK-kM4JZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LK-kNIJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LK-kNYJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2BJAVomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2BJnYImCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2BJnYYmCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LLL_lIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_jOOd0IuXEeiu6boZkiJHCA" target="_LLL_kIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LLL_lYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LLL_mYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2Bm6ZImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_jOOd0IuXEeiu6boZkiJHCA" target="_2Bm6YImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2Bm6ZYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2BnhcomCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_dvFv0EeLEeetffGEmR5xrg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LLL_loJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LLL_l4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LLL_mIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2Bm6ZomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2BnhcImCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2BnhcYmCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LLdsZIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_maeXYIuXEeiu6boZkiJHCA" target="_LLdsYIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LLdsZYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LLdsaYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2CHQtImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_maeXYIuXEeiu6boZkiJHCA" target="_2CHQsImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2CHQtYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2CHQuYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_SHJxwJRKEee0N_ppE1lIiw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LLdsZoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LLdsZ4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LLdsaIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2CHQtomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2CHQt4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2CHQuImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LMLeEIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_C8QWsDIOEeaBg9FoTfINnA" target="_LMK3AIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LMLeEYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LMLeFYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2DbfVImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_C8QWsDIOEeaBg9FoTfINnA" target="_2DbfUImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2DbfVYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2DbfWYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_CJrDMDIOEeaBg9FoTfINnA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LMLeEoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LMLeE4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LMLeFIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2DbfVomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2DbfV4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2DbfWImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LNg60YJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_Ye9PIEKhEea-2Meh9kw1kA" target="_LNgTwIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LNg60oJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LNg61oJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2FQERImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_Ye9PIEKhEea-2Meh9kw1kA" target="_2FQEQImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2FQrUImCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2FQrVImCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Um-Q8EKhEea-2Meh9kw1kA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LNg604JZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LNg61IJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LNg61YJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2FQrUYmCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2FQrUomCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2FQrU4mCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LOOFcYJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_QeIAABNJEeeQQtMBY9ly8w" target="_LONeYIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LOOFcoJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LOOFdoJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2GGY1ImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_QeIAABNJEeeQQtMBY9ly8w" target="_2GGY0ImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2GGY1YmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2GGY2YmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_QeB5YBNJEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LOOFc4JZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LOOFdIJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LOOFdYJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2GGY1omCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2GGY14mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2GGY2ImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LOdWAYJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_bkj9wIuXEeiu6boZkiJHCA" target="_LOcu8IJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LOdWAoJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LOdWBoJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2GWQdImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_bkj9wIuXEeiu6boZkiJHCA" target="_2GWQcImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2GWQdYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2GWQeYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_cOYiQDIOEeaBg9FoTfINnA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LOdWA4JZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LOdWBIJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LOdWBYJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2GWQdomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2GWQd4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2GWQeImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LO-6dIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_pMPTcENfEeajnf5I7cki4A" target="_LO-6cIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LO-6dYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LO-6eYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2G8GVImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_pMPTcENfEeajnf5I7cki4A" target="_2G8GUImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2G8GVYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2G8GWYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LO-6doJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LO-6d4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LO-6eIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2G8GVomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2G8GV4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2G8GWImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LP78tIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_sWvgkENfEeajnf5I7cki4A" target="_LP78sIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LP78tYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LP78uYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2HqfFImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_sWvgkENfEeajnf5I7cki4A" target="_2HqfEImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2HqfFYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2HqfGYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LP78toJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LP78t4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LP78uIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2HqfFomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2HqfF4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2HqfGImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LQ4-8IJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_8TZcIEeKEeetffGEmR5xrg" target="_LQ4X4IJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LQ4-8YJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LQ4-9YJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2Ie-dImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_8TZcIEeKEeetffGEmR5xrg" target="_2Ie-cImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2Ie-dYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2Ie-eYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_8TUjoEeKEeetffGEmR5xrg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LQ4-8oJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LQ4-84JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LQ4-9IJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2Ie-domCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Ie-d4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Ie-eImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LST7RIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_n98UUIz2EeeZS7Bq2RfTZA" target="_LST7QIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LST7RYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LST7SYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2J-MNImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_n98UUIz2EeeZS7Bq2RfTZA" target="_2J-MMImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2J-MNYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2J-MOYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_IHt9wEeWEeetffGEmR5xrg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LST7RoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LST7R4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LST7SIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2J-MNomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2J-MN4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2J-MOImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LTiqUIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_MoYb8JRKEee0N_ppE1lIiw" target="_LTiDQIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LTiqUYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LTiqVYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2LaWpImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_MoYb8JRKEee0N_ppE1lIiw" target="_2LaWoImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2LaWpYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2LaWqYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_MoTjcJRKEee0N_ppE1lIiw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LTiqUoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LTiqU4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LTiqVIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2LaWpomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2LaWp4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2LaWqImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LVCfIIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_DrIj4G-UEeqLWtFsc04LIg" target="_LVB4EIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LVCfIYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LVCfJYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2M3vNImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_DrIj4G-UEeqLWtFsc04LIg" target="_2M3vMImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2M3vNYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2M3vOYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Dq-L0G-UEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LVCfIoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LVCfI4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LVCfJIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2M3vNomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2M3vN4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2M3vOImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LVqxQYJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_brPt8G-UEeqLWtFsc04LIg" target="_LVqKMIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LVqxQoJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LVqxRoJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_2NpLRImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_brPt8G-UEeqLWtFsc04LIg" target="_2NpLQImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2NpLRYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2NpLSYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_brN4wG-UEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LVqxQ4JZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LVqxRIJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LVqxRYJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2NpLRomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2NpLR4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2NpLSImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LWWtxIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_SXH3MG-UEeqLWtFsc04LIg" target="_LWWtwIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LWWtxYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LWWtyYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2N4b0YmCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_nOq_cHNmEeq5_dSLunoRNA" target="_2N30wImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2N4b0omCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2N4b1omCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_nJmSMHNmEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LWWtxoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LWWtx4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LWWtyIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2N4b04mCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2N4b1ImCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2N4b1YmCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LXLNJIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_6dCuQHNlEeq5_dSLunoRNA" target="_LXLNIIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LXLNJYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LXLNKYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_6cZ1EHNlEeq5_dSLunoRNA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2OLWxImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_wjk5UHNmEeq5_dSLunoRNA" target="_2OLWwImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2OLWxYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2OL90ImCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_wf4sIHNmEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LXLNJoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LXLNJ4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LXLNKIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2OLWxomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2OLWx4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2OLWyImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LYUcoYJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_684E4HNlEeq5_dSLunoRNA" target="_LYT1kIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LYUcooJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LYUcpoJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_68rQkHNlEeq5_dSLunoRNA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2OjKNImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_uqjAkHeXEeqNg6iBMTiyZw" target="_2OjKMImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2OjxQImCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2OjxRImCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_umDiIHeXEeqNg6iBMTiyZw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LYUco4JZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LYUcpIJZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LYUcpYJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2OjxQYmCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2OjxQomCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2OjxQ4mCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LZYzpIJZEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_g3DbgHeXEeqNg6iBMTiyZw" target="_LZYzoIJZEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_LZYzpYJZEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LZYzqYJZEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_g2mvkHeXEeqNg6iBMTiyZw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2PNRhImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_SXH3MG-UEeqLWtFsc04LIg" target="_2PNRgImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2PNRhYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2PNRiYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LZYzpoJZEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LZYzp4JZEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LZYzqIJZEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2PNRhomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2PNRh4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2PNRiImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_uG8zUYJjEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_uqjAkHeXEeqNg6iBMTiyZw" target="_uG8MQ4JjEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_uG8zUoJjEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_uG8zVoJjEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_umDiIHeXEeqNg6iBMTiyZw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2P7qRImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_6dCuQHNlEeq5_dSLunoRNA" target="_2P7qQImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2P7qRYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2P7qSYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_6cZ1EHNlEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_uG8zU4JjEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_uG8zVIJjEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_uG8zVYJjEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2P7qRomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2P7qR4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2P7qSImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wz_oZIJjEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_nOq_cHNmEeq5_dSLunoRNA" target="_wz_oYIJjEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wz_oZYJjEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wz_oaYJjEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_nJmSMHNmEeq5_dSLunoRNA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2Q_aNImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_684E4HNlEeq5_dSLunoRNA" target="_2Q_aMImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2Q_aNYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2Q_aOYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_68rQkHNlEeq5_dSLunoRNA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wz_oZoJjEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wz_oZ4JjEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wz_oaIJjEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2Q_aNomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Q_aN4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Q_aOImCEeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_yF-NoIJjEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_wjk5UHNmEeq5_dSLunoRNA" target="_yF9mk4JjEeqLl4tIPv2RCg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_yF-NoYJjEeqLl4tIPv2RCg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_yF-NpYJjEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_wf4sIHNmEeq5_dSLunoRNA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_2R_fxImCEeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_g3DbgHeXEeqNg6iBMTiyZw" target="_2R_fwImCEeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_2R_fxYmCEeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2R_fyYmCEeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_g2mvkHeXEeqNg6iBMTiyZw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_yF-NooJjEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_yF-No4JjEeqLl4tIPv2RCg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_yF-NpIJjEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2R_fxomCEeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2R_fx4mCEeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2R_fyImCEeqL-oc9WWhEWw"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_lW6NAJQPEeebLvYqX3NA2Q" type="PapyrusUMLClassDiagram" name="OduOamSpec" measurementUnit="Pixel">
@@ -7275,15 +7311,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YM6bf5QQEeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOam.uml#_CE0kkLwmEeSpn78DYJKtkA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YM5NUZQQEeebLvYqX3NA2Q" x="262" y="-4" width="262" height="74"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_YNGos5QQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YNGotJQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YNGotpQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOam.uml#_CE0kkLwmEeSpn78DYJKtkA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YNGotZQQEeebLvYqX3NA2Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YM5NUZQQEeebLvYqX3NA2Q" x="260" y="-80" width="262" height="74"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_Y4w00JQQEeebLvYqX3NA2Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_Y4w00pQQEeebLvYqX3NA2Q" type="Class_NameLabel"/>
@@ -7329,23 +7357,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y4xb8JQQEeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOdu.uml#_I7CxwEeOEeetffGEmR5xrg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y4w00ZQQEeebLvYqX3NA2Q" x="173" y="146" width="413" height="125"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Y49CE5QQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Y49CFJQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Y49CFpQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_I7CxwEeOEeetffGEmR5xrg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y49CFZQQEeebLvYqX3NA2Q" x="200"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_aIwdEJQQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_aIwdEZQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aIwdE5QQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_2kAccINLEeelF8AE_WZtHQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aIwdEpQQEeebLvYqX3NA2Q" x="378" y="201"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y4w00ZQQEeebLvYqX3NA2Q" x="173" y="80" width="413" height="191"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_dU2lo5QQEeebLvYqX3NA2Q" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_dU2lpJQQEeebLvYqX3NA2Q" showTitle="true"/>
@@ -7387,15 +7399,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ehbtiZQQEeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOam.uml#_k-OoENzEEeaMV83ubDcSig"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ehafYZQQEeebLvYqX3NA2Q" x="856" y="1" width="256" height="81"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ehqXA5QQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ehqXBJQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ehqXBpQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOam.uml#_k-OoENzEEeaMV83ubDcSig"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ehqXBZQQEeebLvYqX3NA2Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ehafYZQQEeebLvYqX3NA2Q" x="860" y="-80" width="256" height="81"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_fNwA8JQQEeebLvYqX3NA2Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_fNwoAJQQEeebLvYqX3NA2Q" type="Class_NameLabel"/>
@@ -7441,23 +7445,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fNwoEZQQEeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOdu.uml#_w6lhAJQOEeebLvYqX3NA2Q"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fNwA8ZQQEeebLvYqX3NA2Q" x="787" y="150" width="384" height="124"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_fN-DY5QQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_fN-DZJQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fN-DZpQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_w6lhAJQOEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fN-DZZQQEeebLvYqX3NA2Q" x="200"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_f3zDgJQQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_f3zDgZQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_f3zDg5QQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_IBkqsJQPEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_f3zDgpQQEeebLvYqX3NA2Q" x="862" y="206"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fNwA8ZQQEeebLvYqX3NA2Q" x="787" y="80" width="384" height="194"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_1NkHMJQQEeebLvYqX3NA2Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_1NkuQJQQEeebLvYqX3NA2Q" type="Class_NameLabel"/>
@@ -7511,15 +7499,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1NkuUZQQEeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOdu.uml#_rC2RkJQOEeebLvYqX3NA2Q"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1NkHMZQQEeebLvYqX3NA2Q" x="1088" y="390" width="239" height="161"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_1NwUc5QQEeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_1NwUdJQQEeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_1NwUdpQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_rC2RkJQOEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1NwUdZQQEeebLvYqX3NA2Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1NkHMZQQEeebLvYqX3NA2Q" x="1088" y="390" width="239" height="271"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_IdF3IJQREeebLvYqX3NA2Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_IdGeMJQREeebLvYqX3NA2Q" type="Class_NameLabel"/>
@@ -7549,15 +7529,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IdGeQZQREeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOdu.uml#_P1C4cIHDEeeh4KO3PMo8Rw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IdF3IZQREeebLvYqX3NA2Q" x="589" y="399" width="203" height="63"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_IdUgo5QREeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IdUgpJQREeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IdUgppQREeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_P1C4cIHDEeeh4KO3PMo8Rw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IdUgpZQREeebLvYqX3NA2Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IdF3IZQREeebLvYqX3NA2Q" x="600" y="440" width="203" height="122"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_L8RTwJQREeebLvYqX3NA2Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_L8R60JQREeebLvYqX3NA2Q" type="Class_NameLabel"/>
@@ -7615,15 +7587,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_L8R64ZQREeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOdu.uml#_VT7jAIHDEeeh4KO3PMo8Rw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_L8RTwZQREeebLvYqX3NA2Q" x="286" y="389" width="272" height="177"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_L8jAkJQREeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_L8jAkZQREeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_L8jAk5QREeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_VT7jAIHDEeeh4KO3PMo8Rw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_L8jAkpQREeebLvYqX3NA2Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_L8RTwZQREeebLvYqX3NA2Q" x="286" y="389" width="272" height="272"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="__HUlIJQREeebLvYqX3NA2Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="__HUlIpQREeebLvYqX3NA2Q" type="Class_NameLabel"/>
@@ -7653,15 +7617,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="__HUlM5QREeebLvYqX3NA2Q"/>
       </children>
       <element href="TapiOdu.uml#__HPsoJQREeebLvYqX3NA2Q"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__HUlIZQREeebLvYqX3NA2Q" x="874" y="399" width="171" height="70"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__Har0pQREeebLvYqX3NA2Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="__Har05QREeebLvYqX3NA2Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__HbS0JQREeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#__HPsoJQREeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Har1JQREeebLvYqX3NA2Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__HUlIZQREeebLvYqX3NA2Q" x="880" y="420" width="171" height="142"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_sIDPMJRHEee0N_ppE1lIiw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_sIEdUJRHEee0N_ppE1lIiw" type="Class_NameLabel"/>
@@ -7727,15 +7683,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_sIGSjpRHEee0N_ppE1lIiw"/>
       </children>
       <element href="TapiOdu.uml#_sGWmEJRHEee0N_ppE1lIiw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_sIDPMZRHEee0N_ppE1lIiw" x="15" y="390" width="245" height="208"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_sINnRZRHEee0N_ppE1lIiw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_sINnRpRHEee0N_ppE1lIiw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_sINnSJRHEee0N_ppE1lIiw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_sGWmEJRHEee0N_ppE1lIiw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_sINnR5RHEee0N_ppE1lIiw" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_sIDPMZRHEee0N_ppE1lIiw" x="15" y="390" width="245" height="311"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_c-AP0JSoEeeTcuZP_vjYKw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_c-FvYJSoEeeTcuZP_vjYKw" type="Class_NameLabel"/>
@@ -7781,15 +7729,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c-GWfpSoEeeTcuZP_vjYKw"/>
       </children>
       <element href="TapiOdu.uml#_ceGE4JShEeeTcuZP_vjYKw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c-AP0ZSoEeeTcuZP_vjYKw" x="829" y="522" width="176" height="125"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_c-wdw5SoEeeTcuZP_vjYKw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_c-wdxJSoEeeTcuZP_vjYKw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c-wdxpSoEeeTcuZP_vjYKw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_ceGE4JShEeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c-wdxZSoEeeTcuZP_vjYKw" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c-AP0ZSoEeeTcuZP_vjYKw" x="832" y="690" width="229" height="199"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_2xh4QJSoEeeTcuZP_vjYKw" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_2xh4QZSoEeeTcuZP_vjYKw" showTitle="true"/>
@@ -7887,95 +7827,191 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nagp_pSzEeeTcuZP_vjYKw"/>
       </children>
       <element href="TapiOdu.uml#_nabKYJSzEeeTcuZP_vjYKw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nagC4ZSzEeeTcuZP_vjYKw" x="617" y="512" width="181" height="139"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nagC4ZSzEeeTcuZP_vjYKw" x="620" y="680" width="181" height="209"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_naqa8pSzEeeTcuZP_vjYKw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_naqa85SzEeeTcuZP_vjYKw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_naqa9ZSzEeeTcuZP_vjYKw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_nabKYJSzEeeTcuZP_vjYKw"/>
+    <children xsi:type="notation:Shape" xmi:id="_keEYQI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_keEYQY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_keEYQ46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOam.uml#_CE0kkLwmEeSpn78DYJKtkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_naqa9JSzEeeTcuZP_vjYKw" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_keEYQo6-EeqL-oc9WWhEWw" x="462" y="-4"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_rBBrwIuXEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_rBBrwYuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rBBrw4uXEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kfX_0I6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kfX_0Y6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kfX_046-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_I7CxwEeOEeetffGEmR5xrg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kfX_0o6-EeqL-oc9WWhEWw" x="373" y="146"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kgbIsI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kgbIsY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kgbIs46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_2kAccINLEeelF8AE_WZtHQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kgbIso6-EeqL-oc9WWhEWw" x="373" y="46"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kgh2YI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kgh2YY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kgh2Y46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_u4KmYJRHEee0N_ppE1lIiw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rBBrwouXEeiu6boZkiJHCA" x="373" y="46"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kgh2Yo6-EeqL-oc9WWhEWw" x="373" y="46"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_uIrZMIuXEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_uIrZMYuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_uIrZM4uXEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kgrnYI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kgrnYY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kgrnY46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_AeHmcJS2EeeTcuZP_vjYKw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_uIrZMouXEeiu6boZkiJHCA" x="373" y="46"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kgrnYo6-EeqL-oc9WWhEWw" x="373" y="46"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_zwO3kIuXEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_zwO3kYuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_zwO3k4uXEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kg0KQI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kg0KQY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kg0KQ46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_J7cMAIzgEeeZS7Bq2RfTZA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_zwO3kouXEeiu6boZkiJHCA" x="373" y="46"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kg0KQo6-EeqL-oc9WWhEWw" x="373" y="46"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_77zK0IuXEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_77zK0YuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_77zK04uXEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kg9UMI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kg9UMY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kg97QI6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_BDztcJS2EeeTcuZP_vjYKw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_77zK0ouXEeiu6boZkiJHCA" x="373" y="46"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kg9UMo6-EeqL-oc9WWhEWw" x="373" y="46"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HgKl44uYEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HgKl5IuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HgKl5ouYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_khGeII6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_khGeIY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_khGeI46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_Kll8QIzgEeeZS7Bq2RfTZA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HgKl5YuYEeiu6boZkiJHCA" x="373" y="46"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_khGeIo6-EeqL-oc9WWhEWw" x="373" y="46"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_khmNYI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_khmNYY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_khmNY46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOam.uml#_k-OoENzEEeaMV83ubDcSig"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_khmNYo6-EeqL-oc9WWhEWw" x="1056" y="1"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kidJAI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kidJAY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kidJA46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_w6lhAJQOEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kidJAo6-EeqL-oc9WWhEWw" x="987" y="150"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_P20u04uYEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_P20u1IuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_P20u1ouYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kjkjUI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kjkjUY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kjkjU46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_IBkqsJQPEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kjkjUo6-EeqL-oc9WWhEWw" x="987" y="50"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kjrRAI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kjrRAY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kjrRA46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_CfokwJQSEeebLvYqX3NA2Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_P20u1YuYEeiu6boZkiJHCA" x="987" y="50"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kjrRAo6-EeqL-oc9WWhEWw" x="987" y="50"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ZdwM04uYEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ZdwM1IuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZdwM1ouYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kj2QII6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kj2QIY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kj2QI46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_B2-PwJS2EeeTcuZP_vjYKw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZdwM1YuYEeiu6boZkiJHCA" x="987" y="50"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kj2QIo6-EeqL-oc9WWhEWw" x="987" y="50"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_rWg-I4uYEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_rWg-JIuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rWg-JouYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kj-zAI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kj-zAY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kj-zA46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_C8ff4JQSEeebLvYqX3NA2Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rWg-JYuYEeiu6boZkiJHCA" x="987" y="50"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kj-zAo6-EeqL-oc9WWhEWw" x="987" y="50"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ucl-Q4uYEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ucl-RIuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ucl-RouYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kkJLEI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kkJLEY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kkJLE46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#__wbaAJS1EeeTcuZP_vjYKw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ucl-RYuYEeiu6boZkiJHCA" x="987" y="50"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kkJLEo6-EeqL-oc9WWhEWw" x="987" y="50"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_z5N_AIuYEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_z5N_AYuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_z5N_A4uYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_kkRt8I6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kkRt8Y6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kkRt846-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_24Bd4JQQEeebLvYqX3NA2Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z5N_AouYEeiu6boZkiJHCA" x="987" y="50"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kkRt8o6-EeqL-oc9WWhEWw" x="987" y="50"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kk-RgI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kk-RgY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kk-4kI6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_rC2RkJQOEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kk-Rgo6-EeqL-oc9WWhEWw" x="1288" y="390"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kmvzII6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kmvzIY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kmvzI46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_P1C4cIHDEeeh4KO3PMo8Rw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kmvzIo6-EeqL-oc9WWhEWw" x="789" y="399"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kn4bkI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kn4bkY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kn5CoI6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_VT7jAIHDEeeh4KO3PMo8Rw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kn4bko6-EeqL-oc9WWhEWw" x="486" y="389"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kp4msI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kp4msY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kp4ms46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#__HPsoJQREeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kp4mso6-EeqL-oc9WWhEWw" x="1074" y="399"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_krXNYI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_krXNYY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_krXNY46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_sGWmEJRHEee0N_ppE1lIiw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_krXNYo6-EeqL-oc9WWhEWw" x="215" y="390"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kusOMI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kusOMY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kusOM46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_ceGE4JShEeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kusOMo6-EeqL-oc9WWhEWw" x="1029" y="522"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kw2KUI6-EeqL-oc9WWhEWw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kw2KUY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kw2KU46-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_nabKYJSzEeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kw2KUo6-EeqL-oc9WWhEWw" x="817" y="512"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_lW6NAZQPEeebLvYqX3NA2Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_lW6NApQPEeebLvYqX3NA2Q"/>
@@ -8003,48 +8039,20 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_V3qbV5QQEeebLvYqX3NA2Q"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_V3qbWJQQEeebLvYqX3NA2Q"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YNGot5QQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_YM5NUJQQEeebLvYqX3NA2Q" target="_YNGos5QQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YNGouJQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YNHPw5QQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOam.uml#_CE0kkLwmEeSpn78DYJKtkA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YNHPwJQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YNHPwZQQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YNHPwpQQEeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Y49CF5QQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_Y49CE5QQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Y49CGJQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Y49CHJQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_I7CxwEeOEeetffGEmR5xrg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Y49CGZQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y49CGpQQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y49CG5QQEeebLvYqX3NA2Q"/>
-    </edges>
     <edges xsi:type="notation:Connector" xmi:id="_aIq9gJQQEeebLvYqX3NA2Q" type="Dependency_Edge" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_YM5NUJQQEeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_aIq9g5QQEeebLvYqX3NA2Q" type="Dependency_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LB3t4I7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_aIq9hJQQEeebLvYqX3NA2Q" x="14" y="2"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_aIq9hZQQEeebLvYqX3NA2Q" type="Dependency_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LGoSEI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_aIq9hpQQEeebLvYqX3NA2Q" x="-7" y="-2"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_aIq9gZQQEeebLvYqX3NA2Q"/>
       <element href="TapiOdu.uml#_2kAccINLEeelF8AE_WZtHQ"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_aIq9gpQQEeebLvYqX3NA2Q" points="[0, 0, 178, 301]$[-178, -301, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aIrkkJQQEeebLvYqX3NA2Q" id="(0.5157384987893463,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aIrkkZQQEeebLvYqX3NA2Q" id="(0.4732824427480916,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_aIwdFJQQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_aIq9gJQQEeebLvYqX3NA2Q" target="_aIwdEJQQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_aIwdFZQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aIwdGZQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_2kAccINLEeelF8AE_WZtHQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_aIwdFpQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aIwdF5QQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aIwdGJQQEeebLvYqX3NA2Q"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aIrkkJQQEeebLvYqX3NA2Q" id="(0.5012106537530266,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aIrkkZQQEeebLvYqX3NA2Q" id="(0.4580152671755725,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_dU2lp5QQEeebLvYqX3NA2Q" type="StereotypeCommentLink" target="_dU2lo5QQEeebLvYqX3NA2Q">
       <styles xsi:type="notation:FontStyle" xmi:id="_dU2lqJQQEeebLvYqX3NA2Q"/>
@@ -8066,108 +8074,20 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dVYxI5QQEeebLvYqX3NA2Q"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dVYxJJQQEeebLvYqX3NA2Q"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ehqXB5QQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_ehafYJQQEeebLvYqX3NA2Q" target="_ehqXA5QQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ehqXCJQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ehqXDJQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOam.uml#_k-OoENzEEeaMV83ubDcSig"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ehqXCZQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ehqXCpQQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ehqXC5QQEeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_fN-DZ5QQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_fN-DY5QQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_fN-DaJQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fN-qcJQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_w6lhAJQOEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_fN-DaZQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_fN-DapQQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_fN-Da5QQEeebLvYqX3NA2Q"/>
-    </edges>
     <edges xsi:type="notation:Connector" xmi:id="_f3ruwJQQEeebLvYqX3NA2Q" type="Dependency_Edge" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_ehafYJQQEeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_f3ruw5QQEeebLvYqX3NA2Q" type="Dependency_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JK3wAI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_f3ruxJQQEeebLvYqX3NA2Q" x="7" y="4"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_f3ruxZQQEeebLvYqX3NA2Q" type="Dependency_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JO6igI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xsi:type="notation:Location" xmi:id="_f3ruxpQQEeebLvYqX3NA2Q" x="-7" y="1"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_f3ruwZQQEeebLvYqX3NA2Q"/>
       <element href="TapiOdu.uml#_IBkqsJQPEeebLvYqX3NA2Q"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_f3ruwpQQEeebLvYqX3NA2Q" points="[0, 0, 662, 306]$[-662, -306, 0, 0]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_f3rux5QQEeebLvYqX3NA2Q" id="(0.5026041666666666,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_f3ruyJQQEeebLvYqX3NA2Q" id="(0.4866666666666667,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_f3zDhJQQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_f3ruwJQQEeebLvYqX3NA2Q" target="_f3zDgJQQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_f3zDhZQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_f3zDiZQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_IBkqsJQPEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_f3zDhpQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_f3zDh5QQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_f3zDiJQQEeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_1Nw7gJQQEeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_1NkHMJQQEeebLvYqX3NA2Q" target="_1NwUc5QQEeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_1Nw7gZQQEeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_1Nw7hZQQEeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_rC2RkJQOEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1Nw7gpQQEeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1Nw7g5QQEeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1Nw7hJQQEeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IdUgp5QREeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_IdF3IJQREeebLvYqX3NA2Q" target="_IdUgo5QREeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IdUgqJQREeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IdUgrJQREeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_P1C4cIHDEeeh4KO3PMo8Rw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IdUgqZQREeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IdUgqpQREeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IdUgq5QREeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_L8jAlJQREeebLvYqX3NA2Q" type="StereotypeCommentLink" source="_L8RTwJQREeebLvYqX3NA2Q" target="_L8jAkJQREeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_L8jAlZQREeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_L8jAmZQREeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_VT7jAIHDEeeh4KO3PMo8Rw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_L8jAlpQREeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_L8jAl5QREeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_L8jAmJQREeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__HbS0ZQREeebLvYqX3NA2Q" type="StereotypeCommentLink" source="__HUlIJQREeebLvYqX3NA2Q" target="__Har0pQREeebLvYqX3NA2Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="__HbS0pQREeebLvYqX3NA2Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__HbS1pQREeebLvYqX3NA2Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#__HPsoJQREeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__HbS05QREeebLvYqX3NA2Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__HbS1JQREeebLvYqX3NA2Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__HbS1ZQREeebLvYqX3NA2Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_sINnSZRHEee0N_ppE1lIiw" type="StereotypeCommentLink" source="_sIDPMJRHEee0N_ppE1lIiw" target="_sINnRZRHEee0N_ppE1lIiw">
-      <styles xsi:type="notation:FontStyle" xmi:id="_sINnSpRHEee0N_ppE1lIiw"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_sINnTpRHEee0N_ppE1lIiw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_sGWmEJRHEee0N_ppE1lIiw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_sINnS5RHEee0N_ppE1lIiw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sINnTJRHEee0N_ppE1lIiw"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sINnTZRHEee0N_ppE1lIiw"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_c-wdx5SoEeeTcuZP_vjYKw" type="StereotypeCommentLink" source="_c-AP0JSoEeeTcuZP_vjYKw" target="_c-wdw5SoEeeTcuZP_vjYKw">
-      <styles xsi:type="notation:FontStyle" xmi:id="_c-wdyJSoEeeTcuZP_vjYKw"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c-yS8ZSoEeeTcuZP_vjYKw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_ceGE4JShEeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c-wdyZSoEeeTcuZP_vjYKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c-xr4JSoEeeTcuZP_vjYKw"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c-yS8JSoEeeTcuZP_vjYKw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_f3ruyJQQEeebLvYqX3NA2Q" id="(0.46875,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_2xjtcJSoEeeTcuZP_vjYKw" type="StereotypeCommentLink" target="_2xh4QJSoEeeTcuZP_vjYKw">
       <styles xsi:type="notation:FontStyle" xmi:id="_2xjtcZSoEeeTcuZP_vjYKw"/>
@@ -8229,16 +8149,6 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_034qipSyEeeTcuZP_vjYKw"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_034qi5SyEeeTcuZP_vjYKw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_naqa9pSzEeeTcuZP_vjYKw" type="StereotypeCommentLink" source="_nagC4JSzEeeTcuZP_vjYKw" target="_naqa8pSzEeeTcuZP_vjYKw">
-      <styles xsi:type="notation:FontStyle" xmi:id="_naqa95SzEeeTcuZP_vjYKw"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_naqa-5SzEeeTcuZP_vjYKw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_nabKYJSzEeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_naqa-JSzEeeTcuZP_vjYKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_naqa-ZSzEeeTcuZP_vjYKw"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_naqa-pSzEeeTcuZP_vjYKw"/>
-    </edges>
     <edges xsi:type="notation:Connector" xmi:id="_rA0QYIuXEeiu6boZkiJHCA" type="Association_Edge" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_sIDPMJRHEee0N_ppE1lIiw">
       <children xsi:type="notation:DecorationNode" xmi:id="_rA03cIuXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xsi:type="notation:Location" xmi:id="_rA03cYuXEeiu6boZkiJHCA" x="-5" y="8"/>
@@ -8261,27 +8171,17 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_rA0QYYuXEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_u4KmYJRHEee0N_ppE1lIiw"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rA0QYouXEeiu6boZkiJHCA" points="[326, 271, -643984, -643984]$[225, 390, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sTXdYIuXEeiu6boZkiJHCA" id="(0.01937046004842615,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s36U4IuXEeiu6boZkiJHCA" id="(0.6775510204081633,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_rBBrxIuXEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_rA0QYIuXEeiu6boZkiJHCA" target="_rBBrwIuXEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_rBBrxYuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rBBryYuXEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_u4KmYJRHEee0N_ppE1lIiw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rBBrxouXEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rBBrx4uXEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rBBryIuXEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sTXdYIuXEeiu6boZkiJHCA" id="(0.01694915254237288,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s36U4IuXEeiu6boZkiJHCA" id="(0.673469387755102,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_uIfL8IuXEeiu6boZkiJHCA" type="Association_Edge" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_nagC4JSzEeeTcuZP_vjYKw">
       <children xsi:type="notation:DecorationNode" xmi:id="_uIfL84uXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vTEIsIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_uIfL9IuXEeiu6boZkiJHCA" x="-15" y="-214"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_uIfL9IuXEeiu6boZkiJHCA" x="217" y="72"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_uIfL9YuXEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vXNo4IuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_uIfL9ouXEeiu6boZkiJHCA" x="-1" y="-231"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_uIfL9ouXEeiu6boZkiJHCA" x="205" y="55"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_uIfL94uXEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_va0WgIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8302,18 +8202,8 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_uIfL8YuXEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_AeHmcJS2EeeTcuZP_vjYKw"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_uIfL8ouXEeiu6boZkiJHCA" points="[270, 271, -643984, -643984]$[270, 581, -643984, -643984]$[617, 581, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vOX18IuXEeiu6boZkiJHCA" id="(0.23486682808716708,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vOX18YuXEeiu6boZkiJHCA" id="(0.0,0.49640287769784175)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_uIrZNIuXEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_uIfL8IuXEeiu6boZkiJHCA" target="_uIrZMIuXEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_uIrZNYuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_uIrZOYuXEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_AeHmcJS2EeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_uIrZNouXEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_uIrZN4uXEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_uIrZOIuXEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vOX18IuXEeiu6boZkiJHCA" id="(0.25907990314769974,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vOX18YuXEeiu6boZkiJHCA" id="(0.0,0.28708133971291866)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_zwFGkIuXEeiu6boZkiJHCA" type="Association_Edge" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_L8RTwJQREeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_zwFGk4uXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -8343,27 +8233,17 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_zwFGkYuXEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_J7cMAIzgEeeZS7Bq2RfTZA"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_zwFGkouXEeiu6boZkiJHCA" points="[421, 271, -643984, -643984]$[422, 389, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1QcGEIuXEeiu6boZkiJHCA" id="(0.6029055690072639,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1xyfoIuXEeiu6boZkiJHCA" id="(0.5,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_zwO3lIuXEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_zwFGkIuXEeiu6boZkiJHCA" target="_zwO3kIuXEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_zwO3lYuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_zwO3mYuXEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_J7cMAIzgEeeZS7Bq2RfTZA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_zwO3louXEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zwO3l4uXEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zwO3mIuXEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1QcGEIuXEeiu6boZkiJHCA" id="(0.5980629539951574,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1xyfoIuXEeiu6boZkiJHCA" id="(0.49264705882352944,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_77oLsIuXEeiu6boZkiJHCA" type="Association_Edge" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_c-AP0JSoEeeTcuZP_vjYKw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_77oywIuXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9cwnQIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_77oywYuXEeiu6boZkiJHCA" x="-88" y="-114"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_77oywYuXEeiu6boZkiJHCA" x="301" y="52"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_77oywouXEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9hn5IIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_77oyw4uXEeiu6boZkiJHCA" x="-87" y="-132"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_77oyw4uXEeiu6boZkiJHCA" x="305" y="32"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_77oyxIuXEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9mrYQIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8383,19 +8263,9 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_77oLsYuXEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_BDztcJS2EeeTcuZP_vjYKw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_77oLsouXEeiu6boZkiJHCA" points="[571, 271, -643984, -643984]$[571, 475, -643984, -643984]$[908, 475, -643984, -643984]$[908, 522, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8_2BwIuXEeiu6boZkiJHCA" id="(0.9636803874092009,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9YekMIuXEeiu6boZkiJHCA" id="(0.44886363636363635,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_77zK1IuXEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_77oLsIuXEeiu6boZkiJHCA" target="_77zK0IuXEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_77zK1YuXEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_77zK2YuXEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_BDztcJS2EeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_77zK1ouXEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_77zK14uXEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_77zK2IuXEeiu6boZkiJHCA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_77oLsouXEeiu6boZkiJHCA" points="[580, 271, -643984, -643984]$[580, 580, -643984, -643984]$[920, 580, -643984, -643984]$[920, 690, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8_2BwIuXEeiu6boZkiJHCA" id="(0.9854721549636803,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9YekMIuXEeiu6boZkiJHCA" id="(0.38427947598253276,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_HgA04IuYEeiu6boZkiJHCA" type="Association_Edge" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_IdF3IJQREeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_HgA044uYEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -8425,18 +8295,8 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_HgA04YuYEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_Kll8QIzgEeeZS7Bq2RfTZA"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HgA04ouYEeiu6boZkiJHCA" points="[586, 218, -643984, -643984]$[653, 238, -643984, -643984]$[653, 399, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IiZe8IuYEeiu6boZkiJHCA" id="(1.0,0.736)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IiZe8YuYEeiu6boZkiJHCA" id="(0.31527093596059114,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HgKl54uYEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_HgA04IuYEeiu6boZkiJHCA" target="_HgKl44uYEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HgKl6IuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HgKl7IuYEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_Kll8QIzgEeeZS7Bq2RfTZA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HgKl6YuYEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HgKl6ouYEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HgKl64uYEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IiZe8IuYEeiu6boZkiJHCA" id="(1.0,0.837696335078534)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IiZe8YuYEeiu6boZkiJHCA" id="(0.39408866995073893,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_P2JZYIuYEeiu6boZkiJHCA" type="Association_Edge" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_IdF3IJQREeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_P2JZY4uYEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -8466,27 +8326,17 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_P2JZYYuYEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_CfokwJQSEeebLvYqX3NA2Q"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_P2JZYouYEeiu6boZkiJHCA" points="[787, 240, -643984, -643984]$[731, 240, -643984, -643984]$[731, 399, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Q66pEIuYEeiu6boZkiJHCA" id="(0.0,0.7258064516129032)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Q67QIIuYEeiu6boZkiJHCA" id="(0.6995073891625616,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_P20u14uYEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_P2JZYIuYEeiu6boZkiJHCA" target="_P20u04uYEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_P20u2IuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_P20u3IuYEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_CfokwJQSEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_P20u2YuYEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_P20u2ouYEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_P20u24uYEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Q66pEIuYEeiu6boZkiJHCA" id="(0.0,0.8247422680412371)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Q67QIIuYEeiu6boZkiJHCA" id="(0.7881773399014779,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_ZdDpQIuYEeiu6boZkiJHCA" type="Association_Edge" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_nagC4JSzEeeTcuZP_vjYKw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_ZdDpQ4uYEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ckZNoIuYEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZdDpRIuYEeiu6boZkiJHCA" x="-136" y="2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZdDpRIuYEeiu6boZkiJHCA" x="115" y="88"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_ZdDpRYuYEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_codOQIuYEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZdDpRouYEeiu6boZkiJHCA" x="-152" y="-9"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZdDpRouYEeiu6boZkiJHCA" x="95" y="74"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_ZdDpR4uYEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cs4bQIuYEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8506,62 +8356,49 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_ZdDpQYuYEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_B2-PwJS2EeeTcuZP_vjYKw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZdDpQouYEeiu6boZkiJHCA" points="[821, 274, -643984, -643984]$[821, 488, -643984, -643984]$[705, 488, -643984, -643984]$[705, 512, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cfhUsIuYEeiu6boZkiJHCA" id="(0.09114583333333333,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cfhUsYuYEeiu6boZkiJHCA" id="(0.4861878453038674,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ZdwM14uYEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_ZdDpQIuYEeiu6boZkiJHCA" target="_ZdwM04uYEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ZdwM2IuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZdwM3IuYEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_B2-PwJS2EeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZdwM2YuYEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ZdwM2ouYEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ZdwM24uYEeiu6boZkiJHCA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZdDpQouYEeiu6boZkiJHCA" points="[820, 274, -643984, -643984]$[820, 780, -643984, -643984]$[801, 780, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cfhUsIuYEeiu6boZkiJHCA" id="(0.0859375,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cfhUsYuYEeiu6boZkiJHCA" id="(1.0,0.4784688995215311)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_rV5TEIuYEeiu6boZkiJHCA" type="Association_Edge" source="_fNwA8JQQEeebLvYqX3NA2Q" target="__HUlIJQREeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_rV5TE4uYEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TFIuYEeiu6boZkiJHCA" x="16" y="-1"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ti4FoI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TFIuYEeiu6boZkiJHCA" x="5" y="-12"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_rV5TFYuYEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TFouYEeiu6boZkiJHCA" x="5"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TntiUI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TFouYEeiu6boZkiJHCA" x="-15" y="-16"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_rV5TF4uYEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TGIuYEeiu6boZkiJHCA" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TsbqQI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TGIuYEeiu6boZkiJHCA" x="19" y="-20"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_rV5TGYuYEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TGouYEeiu6boZkiJHCA" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Tw6hoI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5TGouYEeiu6boZkiJHCA" x="-19" y="20"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_rV5TG4uYEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5THIuYEeiu6boZkiJHCA" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_T1Xj0I7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5THIuYEeiu6boZkiJHCA" x="19" y="20"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_rV5THYuYEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5THouYEeiu6boZkiJHCA" x="6" y="21"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_T6LyYI7CEeqL-oc9WWhEWw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rV5THouYEeiu6boZkiJHCA" x="-13" y="21"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_rV5TEYuYEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_C8ff4JQSEeebLvYqX3NA2Q"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rV5TEouYEeiu6boZkiJHCA" points="[973, 274, -643984, -643984]$[962, 399, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sbHOsIuYEeiu6boZkiJHCA" id="(0.4453125,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_rWg-J4uYEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_rV5TEIuYEeiu6boZkiJHCA" target="_rWg-I4uYEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_rWg-KIuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rWg-LIuYEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#_C8ff4JQSEeebLvYqX3NA2Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rWg-KYuYEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rWg-KouYEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rWg-K4uYEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sbHOsIuYEeiu6boZkiJHCA" id="(0.4505208333333333,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_QLG4kI7CEeqL-oc9WWhEWw" id="(0.4678362573099415,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_ub9FEIuYEeiu6boZkiJHCA" type="Association_Edge" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_c-AP0JSoEeeTcuZP_vjYKw">
       <children xsi:type="notation:DecorationNode" xmi:id="_ub9sIIuYEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v6uwMIuYEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ub9sIYuYEeiu6boZkiJHCA" x="-140" y="6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ub9sIYuYEeiu6boZkiJHCA" x="264" y="-63"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_ub9sIouYEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v_CocIuYEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ub9sI4uYEeiu6boZkiJHCA" x="-151" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ub9sI4uYEeiu6boZkiJHCA" x="243" y="-84"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_ub9sJIuYEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wDxXcIuYEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8582,25 +8419,15 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_ub9FEYuYEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#__wbaAJS1EeeTcuZP_vjYKw"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ub9FEouYEeiu6boZkiJHCA" points="[1073, 274, -643984, -643984]$[1073, 584, -643984, -643984]$[1005, 584, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_v22VwIuYEeiu6boZkiJHCA" id="(0.7447916666666666,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_v22VwYuYEeiu6boZkiJHCA" id="(1.0,0.496)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ucl-R4uYEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_ub9FEIuYEeiu6boZkiJHCA" target="_ucl-Q4uYEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ucl-SIuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ucmlUIuYEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiOdu.uml#__wbaAJS1EeeTcuZP_vjYKw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ucl-SYuYEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ucl-SouYEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ucl-S4uYEeiu6boZkiJHCA"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_v22VwIuYEeiu6boZkiJHCA" id="(0.7630208333333334,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_v22VwYuYEeiu6boZkiJHCA" id="(1.0,0.25125628140703515)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_z4kewIuYEeiu6boZkiJHCA" type="Association_Edge" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_1NkHMJQQEeebLvYqX3NA2Q">
       <children xsi:type="notation:DecorationNode" xmi:id="_z4kew4uYEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z4kexIuYEeiu6boZkiJHCA" x="22" y="-1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z4kexIuYEeiu6boZkiJHCA" y="-72"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_z4kexYuYEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z4kexouYEeiu6boZkiJHCA" x="9" y="-3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z4kexouYEeiu6boZkiJHCA" x="-20" y="-96"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_z4kex4uYEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <layoutConstraint xsi:type="notation:Location" xmi:id="_z4keyIuYEeiu6boZkiJHCA" y="-20"/>
@@ -8617,18 +8444,238 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_z4kewYuYEeiu6boZkiJHCA"/>
       <element href="TapiOdu.uml#_24Bd4JQQEeebLvYqX3NA2Q"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z4kewouYEeiu6boZkiJHCA" points="[1033, 274, -643984, -643984]$[1136, 390, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0_IeMIuYEeiu6boZkiJHCA" id="(0.9765625,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2H_jsIuYEeiu6boZkiJHCA" id="(0.30962343096234307,0.0)"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0_IeMIuYEeiu6boZkiJHCA" id="(0.9713541666666666,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2H_jsIuYEeiu6boZkiJHCA" id="(0.301255230125523,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_keEYRI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_YM5NUJQQEeebLvYqX3NA2Q" target="_keEYQI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_keEYRY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_keEYSY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOam.uml#_CE0kkLwmEeSpn78DYJKtkA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_keEYRo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_keEYR46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_keEYSI6-EeqL-oc9WWhEWw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_z5N_BIuYEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_z4kewIuYEeiu6boZkiJHCA" target="_z5N_AIuYEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_z5N_BYuYEeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_z5N_CYuYEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_kfX_1I6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_Y4w00JQQEeebLvYqX3NA2Q" target="_kfX_0I6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kfX_1Y6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kfYm4Y6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_I7CxwEeOEeetffGEmR5xrg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kfX_1o6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kfX_146-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kfYm4I6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kgbItI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_aIq9gJQQEeebLvYqX3NA2Q" target="_kgbIsI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kgbItY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kgbIuY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_2kAccINLEeelF8AE_WZtHQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kgbIto6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kgbIt46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kgbIuI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kgidcI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_rA0QYIuXEeiu6boZkiJHCA" target="_kgh2YI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kgidcY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kgiddY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_u4KmYJRHEee0N_ppE1lIiw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kgidco6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kgidc46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kgiddI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kgrnZI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_uIfL8IuXEeiu6boZkiJHCA" target="_kgrnYI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kgrnZY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kgsOcY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_AeHmcJS2EeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kgrnZo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kgrnZ46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kgsOcI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kg0KRI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_zwFGkIuXEeiu6boZkiJHCA" target="_kg0KQI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kg0KRY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kg0KSY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_J7cMAIzgEeeZS7Bq2RfTZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kg0KRo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kg0KR46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kg0KSI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kg97QY6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_77oLsIuXEeiu6boZkiJHCA" target="_kg9UMI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kg97Qo6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kg97Ro6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_BDztcJS2EeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kg97Q46-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kg97RI6-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kg97RY6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_khHFMI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_HgA04IuYEeiu6boZkiJHCA" target="_khGeII6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_khHFMY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_khHFNY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_Kll8QIzgEeeZS7Bq2RfTZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_khHFMo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_khHFM46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_khHFNI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_khmNZI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_ehafYJQQEeebLvYqX3NA2Q" target="_khmNYI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_khmNZY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_khmNaY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOam.uml#_k-OoENzEEeaMV83ubDcSig"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_khmNZo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_khmNZ46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_khmNaI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kidJBI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_fNwA8JQQEeebLvYqX3NA2Q" target="_kidJAI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kidJBY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kidJCY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_w6lhAJQOEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kidJBo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kidJB46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kidJCI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kjkjVI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_f3ruwJQQEeebLvYqX3NA2Q" target="_kjkjUI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kjkjVY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kjkjWY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_IBkqsJQPEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kjkjVo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kjkjV46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kjkjWI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kjrRBI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_P2JZYIuYEeiu6boZkiJHCA" target="_kjrRAI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kjrRBY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kjrRCY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_CfokwJQSEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kjrRBo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kjrRB46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kjrRCI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kj2QJI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_ZdDpQIuYEeiu6boZkiJHCA" target="_kj2QII6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kj2QJY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kj2QKY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_B2-PwJS2EeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kj2QJo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kj2QJ46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kj2QKI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kj-zBI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_rV5TEIuYEeiu6boZkiJHCA" target="_kj-zAI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kj-zBY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kj-zCY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_C8ff4JQSEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kj-zBo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kj-zB46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kj-zCI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kkJLFI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_ub9FEIuYEeiu6boZkiJHCA" target="_kkJLEI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kkJLFY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kkJLGY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#__wbaAJS1EeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kkJLFo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kkJLF46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kkJLGI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kkRt9I6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_z4kewIuYEeiu6boZkiJHCA" target="_kkRt8I6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kkRt9Y6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kkRt-Y6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
         <eObjectValue href="TapiOdu.uml#_24Bd4JQQEeebLvYqX3NA2Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z5N_BouYEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z5N_B4uYEeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z5N_CIuYEeiu6boZkiJHCA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kkRt9o6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kkRt946-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kkRt-I6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kk-4kY6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_1NkHMJQQEeebLvYqX3NA2Q" target="_kk-RgI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kk-4ko6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kk-4lo6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_rC2RkJQOEeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kk-4k46-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kk-4lI6-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kk-4lY6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kmvzJI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_IdF3IJQREeebLvYqX3NA2Q" target="_kmvzII6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kmvzJY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kmvzKY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_P1C4cIHDEeeh4KO3PMo8Rw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kmvzJo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kmvzJ46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kmvzKI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kn5CoY6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_L8RTwJQREeebLvYqX3NA2Q" target="_kn4bkI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kn5Coo6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kn5Cpo6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_VT7jAIHDEeeh4KO3PMo8Rw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kn5Co46-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kn5CpI6-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kn5CpY6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kp4mtI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="__HUlIJQREeebLvYqX3NA2Q" target="_kp4msI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kp4mtY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kp4muY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#__HPsoJQREeebLvYqX3NA2Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kp4mto6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kp4mt46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kp4muI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_krXNZI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_sIDPMJRHEee0N_ppE1lIiw" target="_krXNYI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_krXNZY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_krXNaY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_sGWmEJRHEee0N_ppE1lIiw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_krXNZo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_krXNZ46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_krXNaI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kusONI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_c-AP0JSoEeeTcuZP_vjYKw" target="_kusOMI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kusONY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kusOOY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_ceGE4JShEeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kusONo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kusON46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kusOOI6-EeqL-oc9WWhEWw"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kw2KVI6-EeqL-oc9WWhEWw" type="StereotypeCommentLink" source="_nagC4JSzEeeTcuZP_vjYKw" target="_kw2KUI6-EeqL-oc9WWhEWw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kw2KVY6-EeqL-oc9WWhEWw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kw2KWY6-EeqL-oc9WWhEWw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiOdu.uml#_nabKYJSzEeeTcuZP_vjYKw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kw2KVo6-EeqL-oc9WWhEWw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kw2KV46-EeqL-oc9WWhEWw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kw2KWI6-EeqL-oc9WWhEWw"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_b2XPEKu6Eei1V6VHLzh4gA" type="PapyrusUMLClassDiagram" name="OduTypes" measurementUnit="Pixel">
diff --git a/UML/TapiPhotonicMedia.notation b/UML/TapiPhotonicMedia.notation
index a17afefb..f4f56cc8 100644
--- a/UML/TapiPhotonicMedia.notation
+++ b/UML/TapiPhotonicMedia.notation
@@ -30,7 +30,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xnKzGY6QEeeyZasfnNSonw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xnJk8Y6QEeeyZasfnNSonw" x="222" y="25" height="104"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xnJk8Y6QEeeyZasfnNSonw" x="380" y="40" height="161"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_BsudMI6YEeeyZasfnNSonw" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_BsudMo6YEeeyZasfnNSonw" type="Enumeration_NameLabel"/>
@@ -64,7 +64,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BsudOY6YEeeyZasfnNSonw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BsudMY6YEeeyZasfnNSonw" x="317" y="291"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BsudMY6YEeeyZasfnNSonw" x="280" y="440"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_GaDH8I6YEeeyZasfnNSonw" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_GaDH8o6YEeeyZasfnNSonw" type="Enumeration_NameLabel"/>
@@ -106,7 +106,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GaDH-Y6YEeeyZasfnNSonw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GaDH8Y6YEeeyZasfnNSonw" x="464" y="279"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GaDH8Y6YEeeyZasfnNSonw" x="480" y="440"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_I9O2YI6YEeeyZasfnNSonw" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_I9O2Yo6YEeeyZasfnNSonw" type="Enumeration_NameLabel"/>
@@ -144,7 +144,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_I9PddI6YEeeyZasfnNSonw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_I9O2YY6YEeeyZasfnNSonw" x="741" y="159"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_I9O2YY6YEeeyZasfnNSonw" x="800" y="440"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_Lm61cI6YEeeyZasfnNSonw" type="DataType_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_Lm7cgI6YEeeyZasfnNSonw" type="DataType_NameLabel"/>
@@ -172,7 +172,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lm8DlI6YEeeyZasfnNSonw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lm61cY6YEeeyZasfnNSonw" x="817" y="19" width="378" height="113"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lm61cY6YEeeyZasfnNSonw" x="960" y="240" width="481" height="161"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_xu7CoI8ZEeedErNofqJXiw" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_xvBJQI8ZEeedErNofqJXiw" type="Enumeration_NameLabel"/>
@@ -206,7 +206,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xvBJR48ZEeedErNofqJXiw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xu7CoY8ZEeedErNofqJXiw" x="40" y="700"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xu7CoY8ZEeedErNofqJXiw" x="40" y="780"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_wB7jIXPYEeiPPoPDo3q5jA" type="DataType_Shape">
       <eAnnotations xmi:id="_hdUJUPKvEeiTnqcAgKK24Q" source="PapyrusCSSForceValue">
@@ -241,7 +241,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wB7jL3PYEeiPPoPDo3q5jA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wB7jInPYEeiPPoPDo3q5jA" x="507" y="21" width="290" height="106"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wB7jInPYEeiPPoPDo3q5jA" x="820" y="40" width="421" height="181"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="__ZU_8XkzEeiO-c_khjKlFQ" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="__ZU_83kzEeiO-c_khjKlFQ" type="Enumeration_NameLabel"/>
@@ -301,7 +301,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="__ZU_-nkzEeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__ZU_8nkzEeiO-c_khjKlFQ" x="956" y="163" height="222"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__ZU_8nkzEeiO-c_khjKlFQ" x="1220" y="420" height="361"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_2zBhY3lHEeiW-bN1POS5zg" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_2zBhZHlHEeiW-bN1POS5zg" showTitle="true"/>
@@ -333,7 +333,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YLeOXpKEei5LIrjJTgegQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YLeMXpKEei5LIrjJTgegQ" x="401" y="494"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YLeMXpKEei5LIrjJTgegQ" x="520" y="740"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_DY-LUIoJEeivCevppATXng" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_DZER8IoJEeivCevppATXng" type="Enumeration_NameLabel"/>
@@ -341,6 +341,10 @@
         <layoutConstraint xsi:type="notation:Location" xmi:id="_DZER8ooJEeivCevppATXng" y="5"/>
       </children>
       <children xsi:type="notation:BasicCompartment" xmi:id="_DZER84oJEeivCevppATXng" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_kKT1MKGKEeqPrpdMOOTlbQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiCommon.uml#_swTUkG9LEeqLWtFsc04LIg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_kKT1MaGKEeqPrpdMOOTlbQ"/>
+        </children>
         <styles xsi:type="notation:TitleStyle" xmi:id="_DZER9IoJEeivCevppATXng"/>
         <styles xsi:type="notation:SortingStyle" xmi:id="_DZER9YoJEeivCevppATXng"/>
         <styles xsi:type="notation:FilteringStyle" xmi:id="_DZER9ooJEeivCevppATXng"/>
@@ -420,7 +424,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Er39qYoJEeivCevppATXng"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Er39oYoJEeivCevppATXng" x="49" y="214" height="447"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Er39oYoJEeivCevppATXng" x="40" y="280" height="447"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_EMsiYLqdEeimKvjOEffRIA" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_EMsiYrqdEeimKvjOEffRIA" type="Enumeration_NameLabel"/>
@@ -450,7 +454,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EMsiabqdEeimKvjOEffRIA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EMsiYbqdEeimKvjOEffRIA" x="527" y="494" width="224" height="125"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EMsiYbqdEeimKvjOEffRIA" x="680" y="720" width="301" height="201"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_lnxLALqdEeimKvjOEffRIA" type="Enumeration_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_lnxLArqdEeimKvjOEffRIA" type="Enumeration_NameLabel"/>
@@ -480,7 +484,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lnxLCbqdEeimKvjOEffRIA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lnxLAbqdEeimKvjOEffRIA" x="768" y="492"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lnxLAbqdEeimKvjOEffRIA" x="1060" y="823"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_nCyqQMG-EeiAg83ctgK3eQ" type="DataType_Shape">
       <eAnnotations xmi:id="_h99YQPKvEeiTnqcAgKK24Q" source="PapyrusCSSForceValue">
@@ -511,7 +515,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nCyqTsG-EeiAg83ctgK3eQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nCyqQcG-EeiAg83ctgK3eQ" x="279" y="145"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nCyqQcG-EeiAg83ctgK3eQ" x="320" y="240"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_KXjRAG9yEeqLWtFsc04LIg" type="DataType_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_KXj4EG9yEeqLWtFsc04LIg" type="DataType_NameLabel"/>
@@ -539,135 +543,191 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KXj4HG9yEeqLWtFsc04LIg"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KXjRAW9yEeqLWtFsc04LIg" x="1080" y="500"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ntxdEHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ntxdEXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ntxdE3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KXjRAW9yEeqLWtFsc04LIg" x="720" y="940"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_7EsQ0KGLEeqPrpdMOOTlbQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_7Es34KGLEeqPrpdMOOTlbQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7Es34aGLEeqPrpdMOOTlbQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7Es34qGLEeqPrpdMOOTlbQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_7Es346GLEeqPrpdMOOTlbQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="__LrUUKGLEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_rNbewr1-EeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__LrUUaGLEeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__Lr7YKGLEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_l9HQoFtUEeexvMtO2oNM9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__Lr7YaGLEeqPrpdMOOTlbQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_7Es35KGLEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_7Es35aGLEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_7Es35qGLEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7Es356GLEeqPrpdMOOTlbQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_7Ete8KGLEeqPrpdMOOTlbQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_7Ete8aGLEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_7Ete8qGLEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_7Ete86GLEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7Ete9KGLEeqPrpdMOOTlbQ"/>
+      </children>
+      <element href="TapiCommon.uml#_rNbewL1-EeWdore3Cxez9g"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7EsQ0aGLEeqPrpdMOOTlbQ" x="1500" y="700"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_CYa9IKGMEeqPrpdMOOTlbQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_CYa9IqGMEeqPrpdMOOTlbQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_CYa9I6GMEeqPrpdMOOTlbQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_CYa9JKGMEeqPrpdMOOTlbQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_CYa9JaGMEeqPrpdMOOTlbQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_E1WSkKGMEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_YCsGgFs7EeexvMtO2oNM9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_E1WSkaGMEeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_E1W5oKGMEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_axM7MFs7EeexvMtO2oNM9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_E1W5oaGMEeqPrpdMOOTlbQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_CYa9JqGMEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_CYa9J6GMEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_CYa9KKGMEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CYa9KaGMEeqPrpdMOOTlbQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_CYa9KqGMEeqPrpdMOOTlbQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_CYa9K6GMEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_CYa9LKGMEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_CYa9LaGMEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CYa9LqGMEeqPrpdMOOTlbQ"/>
+      </children>
+      <element href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CYa9IaGMEeqPrpdMOOTlbQ" x="1382" y="882"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_vUzVkKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vUzVkaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vUzVk6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ntxdEnpHEeqOCchXc-J80w" x="422" y="25"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vUzVkqWZEeqJcvXkREZ1XQ" x="580" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nuRMUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nuRMUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nuRMU3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vVTE0KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vVTE0aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVTE06WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nuRMUnpHEeqOCchXc-J80w" x="517" y="291"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vVTE0qWZEeqJcvXkREZ1XQ" x="480" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nuhrAHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nuhrAXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nuhrA3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vVkKkKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vVkKkaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVkKk6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nuhrAnpHEeqOCchXc-J80w" x="664" y="279"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vVkKkqWZEeqJcvXkREZ1XQ" x="680" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nuywwHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nuywwXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nuzX0XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vVzbIKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vVzbIaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVzbI6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nuzX0HpHEeqOCchXc-J80w" x="941" y="159"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vVzbIqWZEeqJcvXkREZ1XQ" x="1000" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nvCBUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nvCBUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvCBU3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vWCEoKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vWCEoaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWCEo6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nvCBUnpHEeqOCchXc-J80w" x="1017" y="19"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vWCEoqWZEeqJcvXkREZ1XQ" x="1160" y="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nvc4EHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nvc4EXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvc4E3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vWbtQKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vWbtQaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWbtQ6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nvc4EnpHEeqOCchXc-J80w" x="240" y="700"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vWbtQqWZEeqJcvXkREZ1XQ" x="240" y="780"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nvqTcHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nvqTcXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvqTc3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vWqWwKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vWqWwaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWqWw6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nvqTcnpHEeqOCchXc-J80w" x="707" y="21"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vWqWwqWZEeqJcvXkREZ1XQ" x="1020" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nwPiQHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nwPiQXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nwQJUHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vXNJUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vXNJUaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXNJU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nwPiQnpHEeqOCchXc-J80w" x="1156" y="163"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vXNJUqWZEeqJcvXkREZ1XQ" x="1420" y="420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nwhPEHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nwhPEXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nwhPE3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vXgrUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vXgrUaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXgrU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nwhPEnpHEeqOCchXc-J80w" x="601" y="494"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vXgrUqWZEeqJcvXkREZ1XQ" x="720" y="740"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nws1QHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nws1QXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nws1Q3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vXzmQKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vXzmQaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXzmQ6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nws1QnpHEeqOCchXc-J80w" x="252" y="34"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vXzmQqWZEeqJcvXkREZ1XQ" x="252" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nw5CgHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nw5CgXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nw5Cg3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vYC20KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vYC20aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYC206WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nw5CgnpHEeqOCchXc-J80w" x="249" y="214"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vYC20qWZEeqJcvXkREZ1XQ" x="240" y="280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nxLWYHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nxLWYXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxLWY3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vYimEKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vYimEaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYimE6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nxLWYnpHEeqOCchXc-J80w" x="249" y="114"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vYimEqWZEeqJcvXkREZ1XQ" x="240" y="180"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nxW8kHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nxW8kXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxW8k3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vY3WMKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vY3WMaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vY3WM6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nxW8knpHEeqOCchXc-J80w" x="727" y="494"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vY3WMqWZEeqJcvXkREZ1XQ" x="880" y="720"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nxiiwHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nxiiwXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxjJ0HpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vZMGUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vZMGUaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZMGU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nxiiwnpHEeqOCchXc-J80w" x="968" y="492"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vZMGUqWZEeqJcvXkREZ1XQ" x="1260" y="823"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nxvXEHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nxvXEXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxvXE3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vZjSsKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vZjSsaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZjSs6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nxvXEnpHEeqOCchXc-J80w" x="479" y="145"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vZjSsqWZEeqJcvXkREZ1XQ" x="520" y="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nyGjcHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nyGjcXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nyGjc3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_vaNaAKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vaNaAaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vaNaA6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nyGjcnpHEeqOCchXc-J80w" x="1280" y="500"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vaNaAqWZEeqJcvXkREZ1XQ" x="920" y="940"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_w3tFAY6QEeeyZasfnNSonw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_w3tFAo6QEeeyZasfnNSonw"/>
@@ -686,7 +746,7 @@
     <edges xsi:type="notation:Connector" xmi:id="_LhPS8YoJEeivCevppATXng" type="Abstraction_Edge" source="_Er39oIoJEeivCevppATXng" target="_DY-LUIoJEeivCevppATXng">
       <children xsi:type="notation:DecorationNode" xmi:id="_LhPS9IoJEeivCevppATXng" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bpezMKvGEei1V6VHLzh4gA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LhPS9YoJEeivCevppATXng" x="7" y="21"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LhPS9YoJEeivCevppATXng" x="25" y="21"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_LhPS9ooJEeivCevppATXng" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_brlE8KvGEei1V6VHLzh4gA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -695,168 +755,168 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_LhPS8ooJEeivCevppATXng"/>
       <element href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LhPS84oJEeivCevppATXng" points="[0, -21, -3, 81]$[3, -94, 0, 8]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMIoJEeivCevppATXng" id="(0.5311004784688995,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMYoJEeivCevppATXng" id="(0.4866666666666667,1.0)"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMIoJEeivCevppATXng" id="(0.5741626794258373,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMYoJEeivCevppATXng" id="(0.5242718446601942,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ntxdFHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xnJk8I6QEeeyZasfnNSonw" target="_ntxdEHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ntxdFXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ntxdGXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vUzVlKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xnJk8I6QEeeyZasfnNSonw" target="_vUzVkKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vUzVlaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vUz8oaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ntxdFnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ntxdF3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ntxdGHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vUzVlqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vUzVl6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vUz8oKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nuRMVHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_BsudMI6YEeeyZasfnNSonw" target="_nuRMUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nuRMVXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nuRMWXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vVTE1KWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BsudMI6YEeeyZasfnNSonw" target="_vVTE0KWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vVTE1aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVTE2aWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nuRMVnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nuRMV3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nuRMWHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vVTE1qWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVTE16WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVTE2KWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nuhrBHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_GaDH8I6YEeeyZasfnNSonw" target="_nuhrAHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nuhrBXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nuiSEnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vVkKlKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GaDH8I6YEeeyZasfnNSonw" target="_vVkKkKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vVkKlaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVkKmaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nuhrBnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nuiSEHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nuiSEXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vVkKlqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVkKl6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVkKmKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nuzX0npHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_I9O2YI6YEeeyZasfnNSonw" target="_nuywwHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nuzX03pHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nuzX13pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vVzbJKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_I9O2YI6YEeeyZasfnNSonw" target="_vVzbIKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vVzbJaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVzbKaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nuzX1HpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nuzX1XpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nuzX1npHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vVzbJqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVzbJ6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVzbKKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nvCBVHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_Lm61cI6YEeeyZasfnNSonw" target="_nvCBUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nvCBVXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvCBWXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vWCEpKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Lm61cI6YEeeyZasfnNSonw" target="_vWCEoKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vWCEpaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWCrsqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nvCBVnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nvCBV3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nvCBWHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vWCEpqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWCrsKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWCrsaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nvc4FHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xu7CoI8ZEeedErNofqJXiw" target="_nvc4EHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nvc4FXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvdfInpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vWcUUKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xu7CoI8ZEeedErNofqJXiw" target="_vWbtQKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vWcUUaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWcUVaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nvc4FnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nvdfIHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nvdfIXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vWcUUqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWcUU6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWcUVKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nvq6gHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_wB7jIXPYEeiPPoPDo3q5jA" target="_nvqTcHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nvq6gXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvq6hXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vWqWxKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_wB7jIXPYEeiPPoPDo3q5jA" target="_vWqWwKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vWqWxaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWqWyaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nvq6gnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nvq6g3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nvq6hHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vWqWxqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWqWx6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWqWyKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nwQJUXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="__ZU_8XkzEeiO-c_khjKlFQ" target="_nwPiQHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nwQJUnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nwQJVnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vXNJVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__ZU_8XkzEeiO-c_khjKlFQ" target="_vXNJUKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vXNJVaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXNJWaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nwQJU3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nwQJVHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nwQJVXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vXNJVqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXNJV6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXNJWKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nwhPFHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_3YLeMHpKEei5LIrjJTgegQ" target="_nwhPEHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nwhPFXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nwhPGXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vXgrVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3YLeMHpKEei5LIrjJTgegQ" target="_vXgrUKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vXgrVaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXhSYqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nwhPFnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nwhPF3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nwhPGHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vXgrVqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXhSYKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXhSYaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nwtcUHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_DY-LUIoJEeivCevppATXng" target="_nws1QHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nwtcUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nwtcVXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vXzmRKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DY-LUIoJEeivCevppATXng" target="_vXzmQKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vXzmRaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXzmSaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nwtcUnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nwtcU3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nwtcVHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vXzmRqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXzmR6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXzmSKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nw5ChHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_Er39oIoJEeivCevppATXng" target="_nw5CgHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nw5ChXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nw5CiXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vYC21KWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Er39oIoJEeivCevppATXng" target="_vYC20KWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vYC21aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYDd4qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nw5ChnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nw5Ch3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nw5CiHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vYC21qWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYDd4KWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYDd4aWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nxLWZHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_LhPS8YoJEeivCevppATXng" target="_nxLWYHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nxLWZXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxLWaXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vYimFKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_LhPS8YoJEeivCevppATXng" target="_vYimEKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vYimFaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYjNIqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nxLWZnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxLWZ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxLWaHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vYimFqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYjNIKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYjNIaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nxW8lHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_EMsiYLqdEeimKvjOEffRIA" target="_nxW8kHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nxW8lXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxW8mXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vY3WNKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EMsiYLqdEeimKvjOEffRIA" target="_vY3WMKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vY3WNaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vY3WOaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nxW8lnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxW8l3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxW8mHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vY3WNqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vY3WN6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vY3WOKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nxjJ0XpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_lnxLALqdEeimKvjOEffRIA" target="_nxiiwHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nxjJ0npHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxjJ1npHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vZMGVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lnxLALqdEeimKvjOEffRIA" target="_vZMGUKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vZMtYKWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZMtZKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nxjJ03pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxjJ1HpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxjJ1XpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vZMtYaWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZMtYqWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZMtY6WZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nxvXFHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_nCyqQMG-EeiAg83ctgK3eQ" target="_nxvXEHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nxvXFXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nxvXGXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vZjStKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_nCyqQMG-EeiAg83ctgK3eQ" target="_vZjSsKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vZjStaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZj5wqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nxvXFnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxvXF3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nxvXGHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vZjStqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZj5wKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZj5waWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nyGjdHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_KXjRAG9yEeqLWtFsc04LIg" target="_nyGjcHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nyGjdXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nyHKgnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_vaNaBKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_KXjRAG9yEeqLWtFsc04LIg" target="_vaNaAKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_vaNaBaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vaNaCaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nyGjdnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nyHKgHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nyHKgXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vaNaBqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vaNaB6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vaNaCKWZEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_gKM6AI6dEeeyZasfnNSonw" type="layersTree" name="Layers Tree Editor"/>
@@ -962,16 +1022,16 @@
         </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4rH_DHjAEeixydPRZ8lIKA" x="-259" y="-447" width="159" height="62"/>
       </children>
-      <children xsi:type="notation:Shape" xmi:id="_oFyUcHpHEeqOCchXc-J80w" type="StereotypeComment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_oFyUcXpHEeqOCchXc-J80w"/>
-        <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oFyUc3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+      <children xsi:type="notation:Shape" xmi:id="_7mMU4KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_7mMU4aV8EeqJcvXkREZ1XQ"/>
+        <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7mM78KV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
           <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
         </styles>
         <element xsi:nil="true"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oFyUcnpHEeqOCchXc-J80w" x="-59" y="-447"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7mMU4qV8EeqJcvXkREZ1XQ" x="-59" y="-447"/>
       </children>
       <element href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-8QyEXiGEeiPPoPDo3q5jA" x="-210" y="-456" width="351" height="62"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-8QyEXiGEeiPPoPDo3q5jA" x="-280" y="-456" width="721" height="62"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_EqrGYHiHEeiPPoPDo3q5jA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_EqrtcHiHEeiPPoPDo3q5jA" type="Class_NameLabel"/>
@@ -1050,7 +1110,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Nhv0yXiHEeiPPoPDo3q5jA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NhvNsXiHEeiPPoPDo3q5jA" x="-260" y="60" height="201"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NhvNsXiHEeiPPoPDo3q5jA" x="-300" y="297" height="201"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_aIaS8HiKEeixydPRZ8lIKA" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_aIaS8XiKEeixydPRZ8lIKA" showTitle="true"/>
@@ -1090,7 +1150,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7No-8HjAEeixydPRZ8lIKA"/>
       </children>
       <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7NoX0XjAEeixydPRZ8lIKA" x="740" y="-460" width="427" height="67"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7NoX0XjAEeixydPRZ8lIKA" x="708" y="-460" width="693" height="67"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_BMxTIHjqEeiO-c_khjKlFQ" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_BMxTIXjqEeiO-c_khjKlFQ" showTitle="true"/>
@@ -1134,7 +1194,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_O0bY4XkwEeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_O0VSMXkwEeiO-c_khjKlFQ" x="480" y="-240" height="100"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_O0VSMXkwEeiO-c_khjKlFQ" x="508" y="-171" height="100"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_-Be4sHkyEeiO-c_khjKlFQ" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_-Be4snkyEeiO-c_khjKlFQ" type="Class_NameLabel"/>
@@ -1172,7 +1232,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-Be4w3kyEeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-Be4sXkyEeiO-c_khjKlFQ" x="40" y="-120" width="361" height="141"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-Be4sXkyEeiO-c_khjKlFQ" x="109" y="115" width="361" height="141"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_XVnyQHk6EeiO-c_khjKlFQ" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_XVoZUHk6EeiO-c_khjKlFQ" type="Class_NameLabel"/>
@@ -1230,7 +1290,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XVoZYXk6EeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XVnyQXk6EeiO-c_khjKlFQ" x="480" y="-20" width="441" height="261"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XVnyQXk6EeiO-c_khjKlFQ" x="509" y="34" width="441" height="261"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_s3mNEJmTEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_s3sTsJmTEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -1260,7 +1320,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s3sTwZmTEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s3mNEZmTEeiOmuqNbykpsw" x="60" y="-320" height="101"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s3mNEZmTEeiOmuqNbykpsw" x="60" y="-300" height="101"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_EtIM4JmWEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_EtIM4pmWEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -1272,6 +1332,10 @@
           <element href="TapiPhotonicMedia.uml#_nWzrw5mYEeiOmuqNbykpsw"/>
           <layoutConstraint xsi:type="notation:Location" xmi:id="_zAoOkZmYEeiOmuqNbykpsw"/>
         </children>
+        <children xsi:type="notation:Shape" xmi:id="_R31AIKE5EeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_1vzJ4G9xEeqLWtFsc04LIg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_R31AIaE5EeqPrpdMOOTlbQ"/>
+        </children>
         <styles xsi:type="notation:TitleStyle" xmi:id="_EtIM5pmWEeiOmuqNbykpsw"/>
         <styles xsi:type="notation:SortingStyle" xmi:id="_EtIM55mWEeiOmuqNbykpsw"/>
         <styles xsi:type="notation:FilteringStyle" xmi:id="_EtIM6JmWEeiOmuqNbykpsw"/>
@@ -1290,7 +1354,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EtIM85mWEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EtIM4ZmWEeiOmuqNbykpsw" x="900" y="-241" width="441" height="102"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EtIM4ZmWEeiOmuqNbykpsw" x="1088" y="-129" width="542" height="125"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_aw4GAJmYEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_aw4GApmYEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -1320,7 +1384,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aw4GE5mYEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aw4GAZmYEeiOmuqNbykpsw" x="1020" y="-60" width="301" height="101"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aw4GAZmYEeiOmuqNbykpsw" x="1363" y="103" width="320" height="121"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_MlzdkJs8EeikSLSDi2qpXA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_Mlzdkps8EeikSLSDi2qpXA" type="Class_NameLabel"/>
@@ -1354,7 +1418,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Mlzdo5s8EeikSLSDi2qpXA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MlzdkZs8EeikSLSDi2qpXA" x="460" y="320" height="141"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MlzdkZs8EeikSLSDi2qpXA" x="506" y="402" height="141"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_gP2P0Lq4EeimKvjOEffRIA" type="Class_Shape">
       <eAnnotations xmi:id="_it2GUMDZEeiXyMZOD9tv6w" source="PapyrusCSSForceValue">
@@ -1416,37 +1480,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gP2P47q4EeimKvjOEffRIA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gP2P0bq4EeimKvjOEffRIA" x="-260" y="360" height="221"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_NzUVwLtKEeiljfl0umr-iQ" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_NzU80LtKEeiljfl0umr-iQ" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NzU80btKEeiljfl0umr-iQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NzU80rtKEeiljfl0umr-iQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_NzU807tKEeiljfl0umr-iQ" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_OvmX0LtKEeiljfl0umr-iQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiPhotonicMedia.uml#_75ksULKeEei69qzpcujF2A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_OvmX0btKEeiljfl0umr-iQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_OvmX0rtKEeiljfl0umr-iQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiPhotonicMedia.uml#_8j738LKeEei69qzpcujF2A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_OvmX07tKEeiljfl0umr-iQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ovm-4LtKEeiljfl0umr-iQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiPhotonicMedia.uml#_-E0b4LKeEei69qzpcujF2A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ovm-4btKEeiljfl0umr-iQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ovm-4rtKEeiljfl0umr-iQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiPhotonicMedia.uml#__ErWYLKeEei69qzpcujF2A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ovm-47tKEeiljfl0umr-iQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_NzU81LtKEeiljfl0umr-iQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_NzU81btKEeiljfl0umr-iQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_NzU81rtKEeiljfl0umr-iQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NzU817tKEeiljfl0umr-iQ"/>
-      </children>
-      <element href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NzUVwbtKEeiljfl0umr-iQ" x="880" y="320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gP2P0bq4EeimKvjOEffRIA" x="-301" y="601" height="221"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_hZNgsG9wEeqLWtFsc04LIg" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_hZNgsm9wEeqLWtFsc04LIg" type="Class_NameLabel"/>
@@ -1488,7 +1522,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hZOHz29wEeqLWtFsc04LIg"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hZNgsW9wEeqLWtFsc04LIg" x="1080" y="140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hZNgsW9wEeqLWtFsc04LIg" x="1160" y="439" width="508" height="148"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_YH1UkG9zEeqLWtFsc04LIg" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_YH17oG9zEeqLWtFsc04LIg" type="Class_NameLabel"/>
@@ -1530,207 +1564,437 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YH17sW9zEeqLWtFsc04LIg"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YH1UkW9zEeqLWtFsc04LIg" x="180" y="480"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_oFic0HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oFic0XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oFic03pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YH1UkW9zEeqLWtFsc04LIg" x="-180" y="-77" height="148"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_j2Dh0JCGEeq3cZ7vVOAmSw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_j2FXAJCGEeq3cZ7vVOAmSw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_j2F-EJCGEeq3cZ7vVOAmSw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_j2F-EZCGEeq3cZ7vVOAmSw" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_j2F-EpCGEeq3cZ7vVOAmSw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_DfwuYKE5EeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_tmlAsJCGEeq3cZ7vVOAmSw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_DfwuYaE5EeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_qxvtwKE-EeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_qngMoKE-EeqPrpdMOOTlbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_qxvtwaE-EeqPrpdMOOTlbQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_j2F-E5CGEeq3cZ7vVOAmSw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_j2F-FJCGEeq3cZ7vVOAmSw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_j2F-FZCGEeq3cZ7vVOAmSw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_j2F-FpCGEeq3cZ7vVOAmSw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_j2GlIJCGEeq3cZ7vVOAmSw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_j2GlIZCGEeq3cZ7vVOAmSw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_j2GlIpCGEeq3cZ7vVOAmSw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_j2GlI5CGEeq3cZ7vVOAmSw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_j2GlJJCGEeq3cZ7vVOAmSw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_j2GlJZCGEeq3cZ7vVOAmSw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_j2GlJpCGEeq3cZ7vVOAmSw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_j2GlJ5CGEeq3cZ7vVOAmSw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_j2GlKJCGEeq3cZ7vVOAmSw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_j2GlKZCGEeq3cZ7vVOAmSw"/>
+      </children>
+      <element href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_j2Dh0ZCGEeq3cZ7vVOAmSw" x="760" y="-282" width="383" height="94"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_pqbkkKE3EeqPrpdMOOTlbQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_pqcLoKE3EeqPrpdMOOTlbQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_pqcLoaE3EeqPrpdMOOTlbQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_pqcLoqE3EeqPrpdMOOTlbQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_pqcysKE3EeqPrpdMOOTlbQ" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_QPqIcKE5EeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_1ZwdAKE4EeqPrpdMOOTlbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QPqIcaE5EeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_2YnDMKE-EeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_2YCbcKE-EeqPrpdMOOTlbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_2YnDMaE-EeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_B5dMYKGQEeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_BscEEKGQEeqPrpdMOOTlbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B5dMYaGQEeqPrpdMOOTlbQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_pqcysaE3EeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_pqcysqE3EeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_pqcys6E3EeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pqcytKE3EeqPrpdMOOTlbQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_pqcytaE3EeqPrpdMOOTlbQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_pqcytqE3EeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_pqcyt6E3EeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_pqcyuKE3EeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pqcyuaE3EeqPrpdMOOTlbQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_pqcyuqE3EeqPrpdMOOTlbQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_pqcyu6E3EeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_pqcyvKE3EeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_pqcyvaE3EeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pqcyvqE3EeqPrpdMOOTlbQ"/>
+      </children>
+      <element href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pqbkkaE3EeqPrpdMOOTlbQ" x="1233" y="-287" height="116"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_LywX8KE8EeqPrpdMOOTlbQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_LywX8qE8EeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_LytUoKE8EeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LywX8aE8EeqPrpdMOOTlbQ" x="1134" y="345" width="166" height="41"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__woNYKE8EeqPrpdMOOTlbQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="__wo0cKE8EeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#__wm_QKE8EeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__woNYaE8EeqPrpdMOOTlbQ" x="1299" y="333" width="283"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_4vLc4KGJEeqPrpdMOOTlbQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4vLc4qGJEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_4vKOwKGJEeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4vLc4aGJEeqPrpdMOOTlbQ" x="839" y="37" height="36"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Ee_6AKGKEeqPrpdMOOTlbQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_EfAhEKGKEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_Ee-r4KGKEeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ee_6AaGKEeqPrpdMOOTlbQ" x="1679" y="82" width="212"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_KvZHwKGPEeqPrpdMOOTlbQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvZHwqGPEeqPrpdMOOTlbQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvZHw6GPEeqPrpdMOOTlbQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvZHxKGPEeqPrpdMOOTlbQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_KvZHxaGPEeqPrpdMOOTlbQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_QdcPsKGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_rNbewr1-EeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QdcPsaGPEeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_QdcPsqGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_l9HQoFtUEeexvMtO2oNM9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QdcPs6GPEeqPrpdMOOTlbQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_KvZHxqGPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_KvZHx6GPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_KvZHyKGPEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KvZHyaGPEeqPrpdMOOTlbQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_KvZu0KGPEeqPrpdMOOTlbQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_KvZu0aGPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_KvZu0qGPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_KvZu06GPEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KvZu1KGPEeqPrpdMOOTlbQ"/>
+      </children>
+      <element href="TapiCommon.uml#_rNbewL1-EeWdore3Cxez9g"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KvZHwaGPEeqPrpdMOOTlbQ" x="1738" y="-68" height="118"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_LwjCwKGPEeqPrpdMOOTlbQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_LwjCwqGPEeqPrpdMOOTlbQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LwjCw6GPEeqPrpdMOOTlbQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LwjCxKGPEeqPrpdMOOTlbQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LwjCxaGPEeqPrpdMOOTlbQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_RyJ_4KGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_YCsGgFs7EeexvMtO2oNM9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_RyJ_4aGPEeqPrpdMOOTlbQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_RyKm8KGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiCommon.uml#_axM7MFs7EeexvMtO2oNM9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_RyKm8aGPEeqPrpdMOOTlbQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LwjCxqGPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LwjCx6GPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LwjCyKGPEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LwjCyaGPEeqPrpdMOOTlbQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LwjCyqGPEeqPrpdMOOTlbQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LwjCy6GPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LwjCzKGPEeqPrpdMOOTlbQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LwjCzaGPEeqPrpdMOOTlbQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LwjCzqGPEeqPrpdMOOTlbQ"/>
+      </children>
+      <element href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LwjCwaGPEeqPrpdMOOTlbQ" x="1738" y="-211" height="123"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_NEwnMKGQEeqPrpdMOOTlbQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_NEwnMqGQEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_NEvZEKGQEeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NEwnMaGQEeqPrpdMOOTlbQ" x="1654" y="-303"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_dn2HkKGnEeqPrpdMOOTlbQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_dn2uoKGnEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_dn05cKGnEeqPrpdMOOTlbQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dn2HkaGnEeqPrpdMOOTlbQ" x="1651" y="-412"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_7liNkKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7liNkaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7li0oKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oFic0npHEeqOCchXc-J80w" x="-10" y="-456"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7liNkqV8EeqJcvXkREZ1XQ" x="-80" y="-456"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oGk-oHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oGk-oXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oGk-o3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7oA50KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7oA50aV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7oA506V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oGk-onpHEeqOCchXc-J80w" x="-96" y="-306"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7oA50qV8EeqJcvXkREZ1XQ" x="-96" y="-306"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oHCRoHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oHCRoXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oHCRo3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7pNzsKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7pNzsaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pNzs6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oHCRonpHEeqOCchXc-J80w" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7pNzsqV8EeqJcvXkREZ1XQ" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oHHKIHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oHHKIXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oHHKI3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7pcdMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7pcdMaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pcdM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oHHKInpHEeqOCchXc-J80w" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7pcdMqV8EeqJcvXkREZ1XQ" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oHp8sHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oHp8sXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oHp8s3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7pv_MKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7pv_MaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pv_M6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7pv_MqV8EeqJcvXkREZ1XQ" x="-96" y="-406"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_7q3ZgKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7q3ZgaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7q3Zg6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oHp8snpHEeqOCchXc-J80w" x="-60" y="60"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7q3ZgqV8EeqJcvXkREZ1XQ" x="-100" y="297"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oIhfYHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oIhfYXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oIhfY3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7s2WgKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7s2WgaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7s2Wg6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oIhfYnpHEeqOCchXc-J80w" x="-60" y="-40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7s2WgqV8EeqJcvXkREZ1XQ" x="-100" y="197"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oI89MHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oI89MXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oI89M3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7tkIMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7tkIMaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7tkIM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oI89MnpHEeqOCchXc-J80w" x="940" y="-460"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7tkIMqV8EeqJcvXkREZ1XQ" x="908" y="-460"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oJskEHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oJskEXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oJskE3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7vZUMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7vZUMaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7vZ7QKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oJskEnpHEeqOCchXc-J80w" x="680" y="-240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7vZUMqV8EeqJcvXkREZ1XQ" x="708" y="-171"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oKLFMHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oKLFMXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oKLsQHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7wgugKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7wgugaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wgug6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oKLFMnpHEeqOCchXc-J80w" x="680" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7wgugqV8EeqJcvXkREZ1XQ" x="708" y="-271"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oKTBAHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oKTBAXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oKTBA3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7wpRYKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7wpRYaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wpRY6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oKTBAnpHEeqOCchXc-J80w" x="680" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7wpRYqV8EeqJcvXkREZ1XQ" x="708" y="-271"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oK3owHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oK3owXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oK3ow3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7xp-AKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7xp-AaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7xp-A6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oK3ownpHEeqOCchXc-J80w" x="240" y="-120"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7xp-AqV8EeqJcvXkREZ1XQ" x="309" y="115"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oL3HQHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oL3HQXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oL3HQ3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_7ztMcKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7ztMcaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7ztzgKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oL3HQnpHEeqOCchXc-J80w" x="680" y="-20"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7ztMcqV8EeqJcvXkREZ1XQ" x="709" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oM8FUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oM8FUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oM8sYHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_71ulsKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_71ulsaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_71uls6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oM8FUnpHEeqOCchXc-J80w" x="680" y="-120"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_71ulsqV8EeqJcvXkREZ1XQ" x="709" y="-66"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oNiiQHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oNiiQXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oNiiQ3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_72tdIKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_72tdIaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_72tdI6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oNiiQnpHEeqOCchXc-J80w" x="260" y="-320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_72tdIqV8EeqJcvXkREZ1XQ" x="260" y="-300"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oN7j0HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oN7j0XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oN7j03pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_73guYKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_73guYaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_73guY6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oN7j0npHEeqOCchXc-J80w" x="260" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_73guYqV8EeqJcvXkREZ1XQ" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oOCRgHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oOCRgXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oOCRg3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_738zQKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_738zQaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_738zQ6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oOCRgnpHEeqOCchXc-J80w" x="260" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_738zQqV8EeqJcvXkREZ1XQ" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oOoHYHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oOoHYXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oOoHY3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_74JnkKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_74JnkaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_74Jnk6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_74JnkqV8EeqJcvXkREZ1XQ" x="260" y="-400"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_75nnMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_75nnMaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_75nnM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oOoHYnpHEeqOCchXc-J80w" x="1100" y="-241"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_75nnMqV8EeqJcvXkREZ1XQ" x="1288" y="-129"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oPEzUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oPFaYHpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oPFaYnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_76r-MKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_76r-MaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_76r-M6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oPFaYXpHEeqOCchXc-J80w" x="1100" y="-341"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_76r-MqV8EeqJcvXkREZ1XQ" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oPK58HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oPK58XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oPK583pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_766nsKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_766nsaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_766ns6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oPK58npHEeqOCchXc-J80w" x="1100" y="-341"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_766nsqV8EeqJcvXkREZ1XQ" x="1288" y="-229"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_77G08KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_77G08aV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_77G086V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_77G08qV8EeqJcvXkREZ1XQ" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oPwv0HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oPwv0XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oPwv03pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_777UUKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_777UUaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_777UU6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oPwv0npHEeqOCchXc-J80w" x="1220" y="-60"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_777UUqV8EeqJcvXkREZ1XQ" x="1563" y="103"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oQkBEHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oQkBEXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oQkBE3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
+    <children xsi:type="notation:Shape" xmi:id="_78k0kKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_78k0kaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_78k0k6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oQkBEnpHEeqOCchXc-J80w" x="660" y="320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_78k0kqV8EeqJcvXkREZ1XQ" x="1563" y="3"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oRbjwHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oRbjwXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oRbjw3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
+    <children xsi:type="notation:Shape" xmi:id="_79fakKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_79fakaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_79fak6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oRbjwnpHEeqOCchXc-J80w" x="-60" y="360"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_79fakqV8EeqJcvXkREZ1XQ" x="706" y="402"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oSRRQHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oSRRQXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oSRRQ3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
+    <children xsi:type="notation:Shape" xmi:id="_7_BroKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7_BroaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7_Bro6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oSRRQnpHEeqOCchXc-J80w" x="1080" y="320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7_BroqV8EeqJcvXkREZ1XQ" x="-101" y="601"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oSjlIHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oSjlIXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oSjlI3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_8A8XMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8A8XMaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8A8XM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oSjlInpHEeqOCchXc-J80w" x="1280" y="140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8A8XMqV8EeqJcvXkREZ1XQ" x="1360" y="439"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oTQIsHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oTQIsXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oTQIs3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_8CMUYKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8CMUYaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8CM7cKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oTQIsnpHEeqOCchXc-J80w" x="380" y="480"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8CMUYqV8EeqJcvXkREZ1XQ" x="20" y="-77"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8D6LoKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8D6LoaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8D6Lo6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8D6LoqV8EeqJcvXkREZ1XQ" x="960" y="-282"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8ElhEKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8ElhEaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8EmIIKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8ElhEqV8EeqJcvXkREZ1XQ" x="960" y="-382"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8ExHQKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8ExHQaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8ExHQ6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8ExHQqV8EeqJcvXkREZ1XQ" x="960" y="-382"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8FWWEKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8FWWEaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8FWWE6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8FWWEqV8EeqJcvXkREZ1XQ" x="1433" y="-287"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8GHyIKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8GHyIaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GHyI6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8GHyIqV8EeqJcvXkREZ1XQ" x="1433" y="-387"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8GPt8KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_8GPt8aV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GQVAKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8GPt8qV8EeqJcvXkREZ1XQ" x="1433" y="-387"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_z6FlAY6dEeeyZasfnNSonw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_z6FlAo6dEeeyZasfnNSonw"/>
@@ -1741,41 +2005,41 @@
     <edges xsi:type="notation:Connector" xmi:id="_Y9rskHiHEeiPPoPDo3q5jA" type="Abstraction_Edge" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_-8QyEHiGEeiPPoPDo3q5jA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_Y9rsk3iHEeiPPoPDo3q5jA" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_DoHywIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y9rslHiHEeiPPoPDo3q5jA" x="9" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y9rslHiHEeiPPoPDo3q5jA" x="8" y="117"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_Y9rslXiHEeiPPoPDo3q5jA" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Dphg8IuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y9rslniHEeiPPoPDo3q5jA" x="28" y="-32"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y9rslniHEeiPPoPDo3q5jA" x="-16" y="121"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_Y9rskXiHEeiPPoPDo3q5jA"/>
       <element href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Y9rskniHEeiPPoPDo3q5jA" points="[-160, -319, -643984, -643984]$[-160, -394, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y_aK4HiHEeiPPoPDo3q5jA" id="(0.6049382716049383,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y_aK4XiHEeiPPoPDo3q5jA" id="(0.14245014245014245,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Y9rskniHEeiPPoPDo3q5jA" points="[-199, -306, -643984, -643984]$[-199, -394, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y_aK4HiHEeiPPoPDo3q5jA" id="(0.3055555555555556,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y_aK4XiHEeiPPoPDo3q5jA" id="(0.11511789181692095,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_Xq0xwHkwEeiO-c_khjKlFQ" type="Abstraction_Edge" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_Xq0xw3kwEeiO-c_khjKlFQ" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_C7RT0IuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Xq0xxHkwEeiO-c_khjKlFQ" x="12" y="-4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Xq0xxHkwEeiO-c_khjKlFQ" x="59" y="-69"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_Xq0xxXkwEeiO-c_khjKlFQ" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_C85rgIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Xq0xxnkwEeiO-c_khjKlFQ" x="-9" y="9"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Xq0xxnkwEeiO-c_khjKlFQ" x="31" y="-98"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_Xq0xwXkwEeiO-c_khjKlFQ"/>
       <element href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xq0xwnkwEeiO-c_khjKlFQ" points="[540, -297, -643984, -643984]$[540, -341, -643984, -643984]$[480, -341, -643984, -643984]$[480, -390, -643984, -643984]"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xq0xwnkwEeiO-c_khjKlFQ" points="[726, -171, -643984, -643984]$[726, -393, -643984, -643984]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrlmwHkwEeiO-c_khjKlFQ" id="(0.6010928961748634,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrlmwXkwEeiO-c_khjKlFQ" id="(0.1405152224824356,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrlmwXkwEeiO-c_khjKlFQ" id="(0.02886002886002886,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_7cWEIIuWEeiu6boZkiJHCA" type="Association_Edge" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_NhvNsHiHEeiPPoPDo3q5jA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_7cWEI4uWEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eCQMoJmXEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7cWEJIuWEeiu6boZkiJHCA" x="-8" y="8"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7cWEJIuWEeiu6boZkiJHCA" x="102" y="-79"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7cWrMIuWEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eEiroJmXEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7cWrMYuWEeiu6boZkiJHCA" x="-30" y="-2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7cWrMYuWEeiu6boZkiJHCA" x="72" y="-123"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7cWrMouWEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eGvEAJmXEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1791,22 +2055,22 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7cWrOIuWEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ePIyEJmXEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7cWrOYuWEeiu6boZkiJHCA" x="-14" y="14"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7cWrOYuWEeiu6boZkiJHCA" x="-17" y="19"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_7cWEIYuWEeiu6boZkiJHCA"/>
       <element href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7cWEIouWEeiu6boZkiJHCA" points="[-140, -235, -643984, -643984]$[-140, -140, -643984, -643984]$[-120, -140, -643984, -643984]$[-120, -39, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9HZQsIuWEeiu6boZkiJHCA" id="(0.48148148148148145,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8gaJMIuWEeiu6boZkiJHCA" id="(0.40899795501022496,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7cWEIouWEeiu6boZkiJHCA" points="[-253, -199, -643984, -643984]$[-253, 297, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9HZQsIuWEeiu6boZkiJHCA" id="(0.12037037037037036,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8gaJMIuWEeiu6boZkiJHCA" id="(0.08793456032719836,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_BDZzQIuXEeiu6boZkiJHCA" type="Association_Edge" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_XVnyQHk6EeiO-c_khjKlFQ" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_BDZzQ4uXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jikh8JmUEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BDZzRIuXEeiu6boZkiJHCA" x="2" y="2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BDZzRIuXEeiu6boZkiJHCA" x="1" y="-86"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_BDZzRYuXEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jlDOMJmUEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BDZzRouXEeiu6boZkiJHCA" x="-15" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BDZzRouXEeiu6boZkiJHCA" x="-21" y="-116"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_BDZzR4uXEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jnPmkJmUEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1826,18 +2090,18 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_BDZzQYuXEeiu6boZkiJHCA"/>
       <element href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_BDZzQouXEeiu6boZkiJHCA" points="[620, -140, -643984, -643984]$[620, -20, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_541CMJmoEeiOmuqNbykpsw" id="(0.3825136612021858,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_CcbbsIuXEeiu6boZkiJHCA" id="(0.31746031746031744,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_BDZzQouXEeiu6boZkiJHCA" points="[600, -71, -643984, -643984]$[600, -27, -643984, -643984]$[594, -27, -643984, -643984]$[594, 34, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_541CMJmoEeiOmuqNbykpsw" id="(0.24316939890710382,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_CcbbsIuXEeiu6boZkiJHCA" id="(0.19954648526077098,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_8V3R4JmTEeiOmuqNbykpsw" type="Association_Edge" source="_s3mNEJmTEeiOmuqNbykpsw" target="_-Be4sHkyEeiO-c_khjKlFQ" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_8V3R45mTEeiOmuqNbykpsw" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_GJu_sJmUEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8V3R5JmTEeiOmuqNbykpsw" x="11" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8V3R5JmTEeiOmuqNbykpsw" x="-71" y="-18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_8V3R5ZmTEeiOmuqNbykpsw" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_GMOTAJmUEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8V3R5pmTEeiOmuqNbykpsw" x="-22" y="-11"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8V3R5pmTEeiOmuqNbykpsw" x="-101" y="-16"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_8V3R55mTEeiOmuqNbykpsw" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_GOs_QJmUEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1857,33 +2121,33 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_8V3R4ZmTEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8V3R4pmTEeiOmuqNbykpsw" points="[140, -237, -643984, -643984]$[140, -200, -643984, -643984]$[100, -200, -643984, -643984]$[100, -146, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8acP4JmTEeiOmuqNbykpsw" id="(0.5115089514066496,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8acP4ZmTEeiOmuqNbykpsw" id="(0.44321329639889195,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8V3R4pmTEeiOmuqNbykpsw" points="[368, -199, -643984, -643984]$[368, -114, -643984, -643984]$[373, -114, -643984, -643984]$[373, 115, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8acP4JmTEeiOmuqNbykpsw" id="(0.8005115089514067,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8acP4ZmTEeiOmuqNbykpsw" id="(0.7313019390581718,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_VE_BkJmVEeiOmuqNbykpsw" type="Abstraction_Edge" source="_s3mNEJmTEeiOmuqNbykpsw" target="_-8QyEHiGEeiPPoPDo3q5jA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_VE_Bk5mVEeiOmuqNbykpsw" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_e7fMoJmVEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_VE_BlJmVEeiOmuqNbykpsw" x="10" y="4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_VE_BlJmVEeiOmuqNbykpsw" x="17" y="100"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_VE_BlZmVEeiOmuqNbykpsw" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_e9rlAJmVEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_VE_BlpmVEeiOmuqNbykpsw" x="-31" y="16"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_VE_BlpmVEeiOmuqNbykpsw" x="-15" y="96"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_VE_BkZmVEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_VE_BkpmVEeiOmuqNbykpsw" points="[64, -303, -643984, -643984]$[64, -352, -643984, -643984]$[68, -352, -643984, -643984]$[68, -394, -643984, -643984]"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_VE_BkpmVEeiOmuqNbykpsw" points="[220, -300, -643984, -643984]$[220, -394, -643984, -643984]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKa7MJmVEeiOmuqNbykpsw" id="(0.4092071611253197,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKa7MZmVEeiOmuqNbykpsw" id="(0.7692307692307693,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKa7MZmVEeiOmuqNbykpsw" id="(0.6934812760055479,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_nZkr4JmYEeiOmuqNbykpsw" type="Association_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_aw4GAJmYEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_nZqygJmYEeiOmuqNbykpsw" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wsOjAJmYEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqygZmYEeiOmuqNbykpsw" x="7" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqygZmYEeiOmuqNbykpsw" x="10" y="80"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_nZqygpmYEeiOmuqNbykpsw" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wvR3AJmYEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqyg5mYEeiOmuqNbykpsw" x="-14" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqyg5mYEeiOmuqNbykpsw" x="-16" y="110"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_nZqyhJmYEeiOmuqNbykpsw" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wzTbYJmYEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1903,33 +2167,33 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_nZkr4ZmYEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nZkr4pmYEeiOmuqNbykpsw" points="[1100, -139, -643984, -643984]$[1100, -60, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoJmYEeiOmuqNbykpsw" id="(0.45351473922902497,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoZmYEeiOmuqNbykpsw" id="(0.46511627906976744,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nZkr4pmYEeiOmuqNbykpsw" points="[1416, -4, -643984, -643984]$[1416, 53, -643984, -643984]$[1411, 53, -643984, -643984]$[1411, 103, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoJmYEeiOmuqNbykpsw" id="(0.5959409594095941,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoZmYEeiOmuqNbykpsw" id="(0.15,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_ObaTQJmaEeiOmuqNbykpsw" type="Abstraction_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_ObaTQ5maEeiOmuqNbykpsw" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_iI6RQJmdEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ObaTRJmaEeiOmuqNbykpsw" x="11" y="17"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ObaTRJmaEeiOmuqNbykpsw" x="75" y="-9"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_ObaTRZmaEeiOmuqNbykpsw" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_iL3eoJmdEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ObaTRpmaEeiOmuqNbykpsw" x="-14" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ObaTRpmaEeiOmuqNbykpsw" x="48" y="-2"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_ObaTQZmaEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ObaTQpmaEeiOmuqNbykpsw" points="[798, -293, -643984, -643984]$[798, -343, -643984, -643984]$[794, -343, -643984, -643984]$[794, -390, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OixfgJmaEeiOmuqNbykpsw" id="(0.31746031746031744,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OixfgZmaEeiOmuqNbykpsw" id="(0.8430913348946136,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ObaTQpmaEeiOmuqNbykpsw" points="[1188, -196, -643984, -643984]$[1188, -350, -643984, -643984]$[1192, -350, -643984, -643984]$[1192, -393, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OixfgJmaEeiOmuqNbykpsw" id="(0.1863468634686347,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OixfgZmaEeiOmuqNbykpsw" id="(0.6955266955266955,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_OBTyQJs8EeikSLSDi2qpXA" type="Association_Edge" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_MlzdkJs8EeikSLSDi2qpXA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyQ5s8EeikSLSDi2qpXA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VVFh4Js8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyRJs8EeikSLSDi2qpXA" x="4" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyRJs8EeikSLSDi2qpXA" x="15" y="-84"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyRZs8EeikSLSDi2qpXA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VYVDIJs8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyRps8EeikSLSDi2qpXA" x="-9" y="13"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyRps8EeikSLSDi2qpXA" x="-12" y="-18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyR5s8EeikSLSDi2qpXA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Va8SQJs8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1949,18 +2213,18 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_OBTyQZs8EeikSLSDi2qpXA"/>
       <element href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_OBTyQps8EeikSLSDi2qpXA" points="[620, 241, -643984, -643984]$[620, 320, -643984, -643984]"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_OBTyQps8EeikSLSDi2qpXA" points="[654, 276, -643984, -643984]$[654, 339, -643984, -643984]$[649, 339, -643984, -643984]$[649, 402, -643984, -643984]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AJs8EeikSLSDi2qpXA" id="(0.31746031746031744,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AZs8EeikSLSDi2qpXA" id="(0.5405405405405406,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AZs8EeikSLSDi2qpXA" id="(0.4831081081081081,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_eVdssLs6Eeiljfl0umr-iQ" type="Association_Edge" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_gP2P0Lq4EeimKvjOEffRIA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_eVjzULs6Eeiljfl0umr-iQ" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_mtZA8Ls6Eeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_eVjzUbs6Eeiljfl0umr-iQ" x="3" y="8"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_eVjzUbs6Eeiljfl0umr-iQ" x="24" y="-80"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_eVjzUrs6Eeiljfl0umr-iQ" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_myuz8Ls6Eeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_eVjzU7s6Eeiljfl0umr-iQ" x="-14" y="-17"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_eVjzU7s6Eeiljfl0umr-iQ" x="-4" y="-15"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_eVjzVLs6Eeiljfl0umr-iQ" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_m47ikLs6Eeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1980,9 +2244,9 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_eVdssbs6Eeiljfl0umr-iQ"/>
       <element href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_eVdssrs6Eeiljfl0umr-iQ" points="[-100, 95, -643984, -643984]$[-100, 220, -643984, -643984]$[-40, 220, -643984, -643984]$[-40, 360, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ek9hQLs6Eeiljfl0umr-iQ" id="(0.4498977505112474,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ek9hQbs6Eeiljfl0umr-iQ" id="(0.5301204819277109,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_eVdssrs6Eeiljfl0umr-iQ" points="[-82, 498, -643984, -643984]$[-82, 601, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ek9hQLs6Eeiljfl0umr-iQ" id="(0.4437627811860941,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ek9hQbs6Eeiljfl0umr-iQ" id="(0.5253012048192771,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_zY6jAMMqEei3gLXE4_XcoA" type="Association_Edge" source="_7NoX0HjAEeixydPRZ8lIKA" target="_-8QyEHiGEeiPPoPDo3q5jA">
       <children xsi:type="notation:DecorationNode" xmi:id="_zY6jA8MqEei3gLXE4_XcoA" type="Association_StereotypeLabel">
@@ -1991,7 +2255,7 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zY6jBcMqEei3gLXE4_XcoA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NH3gsG9rEeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zY6jBsMqEei3gLXE4_XcoA" x="2" y="9"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zY6jBsMqEei3gLXE4_XcoA" x="-8" y="18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zY6jB8MqEei3gLXE4_XcoA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NMe68G9rEeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2003,11 +2267,11 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zY6jC8MqEei3gLXE4_XcoA" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NVDBEG9rEeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zY6jDMMqEei3gLXE4_XcoA" x="13" y="-11"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zY6jDMMqEei3gLXE4_XcoA" x="18" y="-18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zY6jDcMqEei3gLXE4_XcoA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NZajsG9rEeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zY6jDsMqEei3gLXE4_XcoA" x="-13" y="-12"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zY6jDsMqEei3gLXE4_XcoA" x="-13" y="-22"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_zY6jAcMqEei3gLXE4_XcoA"/>
       <element href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
@@ -2015,340 +2279,602 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NeU44G9rEeqLWtFsc04LIg" id="(0.0,0.5970149253731343)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_07ESQMMqEei3gLXE4_XcoA" id="(1.0,0.5806451612903226)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_1zohAG9xEeqLWtFsc04LIg" type="Association_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg">
+    <edges xsi:type="notation:Connector" xmi:id="_1zohAG9xEeqLWtFsc04LIg" type="Association_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpIEG9xEeqLWtFsc04LIg" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIEW9xEeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2GwX0KE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIEW9xEeqLWtFsc04LIg" x="49" y="16"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpIEm9xEeqLWtFsc04LIg" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIE29xEeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2NFCQKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIE29xEeqLWtFsc04LIg" x="24" y="5"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpIFG9xEeqLWtFsc04LIg" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIFW9xEeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2UFCIKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIFW9xEeqLWtFsc04LIg" x="54" y="-18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpvIG9xEeqLWtFsc04LIg" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvIW9xEeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2cJZAKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvIW9xEeqLWtFsc04LIg" x="-55" y="18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpvIm9xEeqLWtFsc04LIg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvI29xEeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2knYgKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvI29xEeqLWtFsc04LIg" x="23" y="22"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpvJG9xEeqLWtFsc04LIg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvJW9xEeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2rnYYKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvJW9xEeqLWtFsc04LIg" x="-23" y="25"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_1zohAW9xEeqLWtFsc04LIg"/>
       <element href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1zohAm9xEeqLWtFsc04LIg" points="[940, -139, -643984, -643984]$[1080, 200, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYG9xEeqLWtFsc04LIg" id="(0.09070294784580499,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYW9xEeqLWtFsc04LIg" id="(0.0,0.34285714285714286)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1zohAm9xEeqLWtFsc04LIg" points="[1175, -4, -643984, -643984]$[1175, 403, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYG9xEeqLWtFsc04LIg" id="(0.15867158671586715,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYW9xEeqLWtFsc04LIg" id="(0.027559055118110236,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7O7aIG9zEeqLWtFsc04LIg" type="Association_Edge" source="_s3mNEJmTEeiOmuqNbykpsw" target="_YH1UkG9zEeqLWtFsc04LIg">
+    <edges xsi:type="notation:Connector" xmi:id="_7O7aIG9zEeqLWtFsc04LIg" type="Association_Edge" source="_s3mNEJmTEeiOmuqNbykpsw" target="_YH1UkG9zEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BMG9zEeqLWtFsc04LIg" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BMW9zEeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-A2gkKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BMW9zEeqLWtFsc04LIg" x="26" y="75"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BMm9zEeqLWtFsc04LIg" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BM29zEeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-FAn0KE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BM29zEeqLWtFsc04LIg" x="-1" y="23"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BNG9zEeqLWtFsc04LIg" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BNW9zEeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-JzoQKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BNW9zEeqLWtFsc04LIg" x="105" y="19"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BNm9zEeqLWtFsc04LIg" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BN29zEeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-O3HYKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BN29zEeqLWtFsc04LIg" x="-106" y="18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BOG9zEeqLWtFsc04LIg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BOW9zEeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-TtyMKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BOW9zEeqLWtFsc04LIg" x="21" y="-18"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BOm9zEeqLWtFsc04LIg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BO29zEeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-YbTEKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7O8BO29zEeqLWtFsc04LIg" x="-15" y="-25"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_7O7aIW9zEeqLWtFsc04LIg"/>
       <element href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7O7aIm9zEeqLWtFsc04LIg" points="[340, -219, -643984, -643984]$[360, 480, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7WzjwG9zEeqLWtFsc04LIg" id="(0.7161125319693095,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7WzjwW9zEeqLWtFsc04LIg" id="(0.37344398340248963,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7O7aIm9zEeqLWtFsc04LIg" points="[196, -199, -643984, -643984]$[196, -77, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7WzjwG9zEeqLWtFsc04LIg" id="(0.34782608695652173,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7WzjwW9zEeqLWtFsc04LIg" id="(0.7800829875518672,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HBj6sG90EeqLWtFsc04LIg" type="Association_Edge" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_YH1UkG9zEeqLWtFsc04LIg">
+    <edges xsi:type="notation:Connector" xmi:id="_HBj6sG90EeqLWtFsc04LIg" type="Association_Edge" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_YH1UkG9zEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_HBkhwG90EeqLWtFsc04LIg" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhwW90EeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UrFc0KE3EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhwW90EeqLWtFsc04LIg" x="13" y="74"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_HBkhwm90EeqLWtFsc04LIg" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhw290EeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UwBAIKE3EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhw290EeqLWtFsc04LIg" x="-13" y="10"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_HBkhxG90EeqLWtFsc04LIg" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhxW90EeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U00AkKE3EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhxW90EeqLWtFsc04LIg" x="112" y="-17"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_HBkhxm90EeqLWtFsc04LIg" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhx290EeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U6B3wKE3EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhx290EeqLWtFsc04LIg" x="-114" y="19"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_HBkhyG90EeqLWtFsc04LIg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhyW90EeqLWtFsc04LIg" y="20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U-s8YKE3EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhyW90EeqLWtFsc04LIg" x="22" y="-17"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_HBkhym90EeqLWtFsc04LIg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhy290EeqLWtFsc04LIg" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VEHn4KE3EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HBkhy290EeqLWtFsc04LIg" x="-19" y="-30"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_HBj6sW90EeqLWtFsc04LIg"/>
       <element href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HBj6sm90EeqLWtFsc04LIg" points="[-60, -199, -643984, -643984]$[300, 480, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HKZGkG90EeqLWtFsc04LIg" id="(0.7283950617283951,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HKZGkW90EeqLWtFsc04LIg" id="(0.24896265560165975,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oFic1HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_-8QyEHiGEeiPPoPDo3q5jA" target="_oFic0HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oFic1XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oFic2XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HBj6sm90EeqLWtFsc04LIg" points="[-88, -199, -643984, -643984]$[-88, -77, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HKZGkG90EeqLWtFsc04LIg" id="(0.6419753086419753,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HKZGkW90EeqLWtFsc04LIg" id="(0.1908713692946058,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_tsusAJCGEeq3cZ7vVOAmSw" type="Association_Edge" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_XVnyQHk6EeiO-c_khjKlFQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_tsvTEJCGEeq3cZ7vVOAmSw" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_C728MJCHEeq3cZ7vVOAmSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tsvTEZCGEeq3cZ7vVOAmSw" x="54" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_tsvTEpCGEeq3cZ7vVOAmSw" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_DBS10JCHEeq3cZ7vVOAmSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tsvTE5CGEeq3cZ7vVOAmSw" x="25" y="-39"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_tsvTFJCGEeq3cZ7vVOAmSw" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_DGv9kJCHEeq3cZ7vVOAmSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tsvTFZCGEeq3cZ7vVOAmSw" x="134" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_tsvTFpCGEeq3cZ7vVOAmSw" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_DLsvAJCHEeq3cZ7vVOAmSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tsv6IJCGEeq3cZ7vVOAmSw" x="-132" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_tsv6IZCGEeq3cZ7vVOAmSw" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_DROIMJCHEeq3cZ7vVOAmSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tsv6IpCGEeq3cZ7vVOAmSw" x="23" y="-22"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_tsv6I5CGEeq3cZ7vVOAmSw" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_DW3dMJCHEeq3cZ7vVOAmSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tsv6JJCGEeq3cZ7vVOAmSw" x="-22" y="-18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_tsusAZCGEeq3cZ7vVOAmSw"/>
+      <element href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_tsusApCGEeq3cZ7vVOAmSw" points="[924, -196, -643984, -643984]$[924, -81, -643984, -643984]$[919, -81, -643984, -643984]$[919, 34, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_t3z6oJCGEeq3cZ7vVOAmSw" id="(0.4151436031331593,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_t3z6oZCGEeq3cZ7vVOAmSw" id="(0.9297052154195011,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_osYdYKE2EeqPrpdMOOTlbQ" type="Abstraction_Edge" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_osa5oKE2EeqPrpdMOOTlbQ" type="Abstraction_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_4lg5QKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_osa5oaE2EeqPrpdMOOTlbQ" x="19" y="12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_osa5oqE2EeqPrpdMOOTlbQ" type="Abstraction_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_4p64IKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_osa5o6E2EeqPrpdMOOTlbQ" x="-11" y="-3"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_osYdYaE2EeqPrpdMOOTlbQ"/>
+      <element href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_osYdYqE2EeqPrpdMOOTlbQ" points="[914, -282, -643984, -643984]$[914, -393, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o4b8YKE2EeqPrpdMOOTlbQ" id="(0.402088772845953,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o4b8YaE2EeqPrpdMOOTlbQ" id="(0.2972582972582973,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_z-f_8KE4EeqPrpdMOOTlbQ" type="Abstraction_Edge" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_z-gnAKE4EeqPrpdMOOTlbQ" type="Abstraction_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6rdAIKE4EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z-gnAaE4EeqPrpdMOOTlbQ" x="15" y="126"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_z-gnAqE4EeqPrpdMOOTlbQ" type="Abstraction_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6v6pYKE4EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z-gnA6E4EeqPrpdMOOTlbQ" x="-6" y="96"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_z-f_8aE4EeqPrpdMOOTlbQ"/>
+      <element href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z-f_8qE4EeqPrpdMOOTlbQ" points="[1374, -287, -643984, -643984]$[1374, -393, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0IKSQKE4EeqPrpdMOOTlbQ" id="(0.3389423076923077,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0IK5UKE4EeqPrpdMOOTlbQ" id="(0.961038961038961,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_1ei2YKE4EeqPrpdMOOTlbQ" type="Association_Edge" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_aw4GAJmYEeiOmuqNbykpsw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ei2Y6E4EeqPrpdMOOTlbQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WNh1EKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ei2ZKE4EeqPrpdMOOTlbQ" x="90" y="75"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ei2ZaE4EeqPrpdMOOTlbQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WS7ScKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ei2ZqE4EeqPrpdMOOTlbQ" x="67" y="75"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ei2Z6E4EeqPrpdMOOTlbQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WX7HMKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ejdcKE4EeqPrpdMOOTlbQ" x="51" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ejdcaE4EeqPrpdMOOTlbQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Wc3RkKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ejdcqE4EeqPrpdMOOTlbQ" x="-51" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ejdc6E4EeqPrpdMOOTlbQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Wh6wsKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ejddKE4EeqPrpdMOOTlbQ" x="24" y="23"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ejddaE4EeqPrpdMOOTlbQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WnTnAKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ejddqE4EeqPrpdMOOTlbQ" x="-17" y="29"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_1ei2YaE4EeqPrpdMOOTlbQ"/>
+      <element href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1ei2YqE4EeqPrpdMOOTlbQ" points="[1638, -183, -643984, -643984]$[1638, -49, -643984, -643984]$[1642, -49, -643984, -643984]$[1642, 103, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEKE4EeqPrpdMOOTlbQ" id="(0.9831730769230769,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEaE4EeqPrpdMOOTlbQ" id="(0.871875,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kK61oKE8EeqPrpdMOOTlbQ" type="Association_Edge" source="_aw4GAJmYEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_kK61o6E8EeqPrpdMOOTlbQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wfgMsKE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK61pKE8EeqPrpdMOOTlbQ" x="-31" y="-80"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kK61paE8EeqPrpdMOOTlbQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wnBJ8KE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK61pqE8EeqPrpdMOOTlbQ" x="-55" y="-132"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kK7csKE8EeqPrpdMOOTlbQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wvja4KE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK7csaE8EeqPrpdMOOTlbQ" x="13" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kK7csqE8EeqPrpdMOOTlbQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_w3E_MKE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK7cs6E8EeqPrpdMOOTlbQ" x="-12" y="17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kK7ctKE8EeqPrpdMOOTlbQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_w_EdkKE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK7ctaE8EeqPrpdMOOTlbQ" x="18" y="-16"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kK7ctqE8EeqPrpdMOOTlbQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xHuqUKE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK7ct6E8EeqPrpdMOOTlbQ" x="-19" y="-28"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_kK61oaE8EeqPrpdMOOTlbQ"/>
+      <element href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kK61oqE8EeqPrpdMOOTlbQ" points="[1443, 224, -643984, -643984]$[1443, 403, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kcUHoKE8EeqPrpdMOOTlbQ" id="(0.25,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kcUusKE8EeqPrpdMOOTlbQ" id="(0.5570866141732284,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_IM9d4KGoEeqPrpdMOOTlbQ" type="Association_Edge" source="_7NoX0HjAEeixydPRZ8lIKA" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_IM-E8KGoEeqPrpdMOOTlbQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_K4ny4KGoEeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IM-E8aGoEeqPrpdMOOTlbQ" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IM-E8qGoEeqPrpdMOOTlbQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LJzpgKGoEeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IM-E86GoEeqPrpdMOOTlbQ" y="88"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IM-E9KGoEeqPrpdMOOTlbQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LcNBEKGoEeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IM-E9aGoEeqPrpdMOOTlbQ" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IM-E9qGoEeqPrpdMOOTlbQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LsuwYKGoEeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IM-E96GoEeqPrpdMOOTlbQ" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IM-E-KGoEeqPrpdMOOTlbQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MAJboKGoEeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IM-E-aGoEeqPrpdMOOTlbQ" x="21" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IM-E-qGoEeqPrpdMOOTlbQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MRK6MKGoEeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IM-E-6GoEeqPrpdMOOTlbQ" x="-36" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_IM9d4aGoEeqPrpdMOOTlbQ"/>
+      <element href="TapiConnectivity.uml#_rfKYYIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IM9d4qGoEeqPrpdMOOTlbQ" points="[1401, -448, -643984, -643984]$[1632, -448, -643984, -643984]$[1632, -407, -643984, -643984]$[1401, -407, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_KmorAKGoEeqPrpdMOOTlbQ" id="(1.0,0.1791044776119403)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_KmorAaGoEeqPrpdMOOTlbQ" id="(1.0,0.7910447761194029)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_7ljbsKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-8QyEHiGEeiPPoPDo3q5jA" target="_7liNkKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7ljbsaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7lkCwKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oFic1npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oFic13pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oFic2HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7ljbsqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ljbs6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ljbtKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oFyUdHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_4rH-0HjAEeixydPRZ8lIKA" target="_oFyUcHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oFyUdXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oFyUeXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7mM78aV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4rH-0HjAEeixydPRZ8lIKA" target="_7mMU4KV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7mM78qV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7mM79qV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oFyUdnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oFyUd3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oFyUeHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7mM786V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7mM79KV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7mM79aV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oGk-pHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_oGk-oHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oGk-pXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oGk-qXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7oA51KV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_7oA50KV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7oA51aV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7oA52aV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oGk-pnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oGk-p3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oGk-qHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7oA51qV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7oA516V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7oA52KV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oHCRpHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_Y9rskHiHEeiPPoPDo3q5jA" target="_oHCRoHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oHCRpXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oHCRqXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7pNztKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Y9rskHiHEeiPPoPDo3q5jA" target="_7pNzsKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7pNztaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pNzuaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oHCRpnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oHCRp3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oHCRqHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7pNztqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pNzt6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pNzuKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oHHKJHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_7cWEIIuWEeiu6boZkiJHCA" target="_oHHKIHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oHHKJXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oHHxMnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7pcdNKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7cWEIIuWEeiu6boZkiJHCA" target="_7pcdMKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7pcdNaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pcdOaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oHHKJnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oHHxMHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oHHxMXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7pcdNqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pcdN6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pcdOKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_7pv_NKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_HBj6sG90EeqLWtFsc04LIg" target="_7pv_MKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7pv_NaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pwmQKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7pv_NqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pv_N6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pv_OKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oHp8tHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_oHp8sHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oHp8tXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oHp8uXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7q4AkKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_7q3ZgKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7q4AkaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7q4AlaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oHp8tnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oHp8t3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oHp8uHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7q4AkqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7q4Ak6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7q4AlKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oIhfZHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_eVdssLs6Eeiljfl0umr-iQ" target="_oIhfYHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oIhfZXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oIhfaXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7s2WhKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_eVdssLs6Eeiljfl0umr-iQ" target="_7s2WgKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7s2WhaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7s2WiaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oIhfZnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oIhfZ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oIhfaHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7s2WhqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7s2Wh6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7s2WiKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oI89NHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_7NoX0HjAEeixydPRZ8lIKA" target="_oI89MHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oI89NXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oI89OXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7tkvQKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7NoX0HjAEeixydPRZ8lIKA" target="_7tkIMKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7tkvQaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7tkvRaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oI89NnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oI89N3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oI89OHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7tkvQqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7tkvQ6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7tkvRKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oJskFHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_oJskEHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oJskFXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oJskGXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7vZ7QaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_7vZUMKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7vZ7QqV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7vZ7RqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oJskFnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oJskF3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oJskGHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7vZ7Q6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7vZ7RKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7vZ7RaV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oKLsQXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_Xq0xwHkwEeiO-c_khjKlFQ" target="_oKLFMHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oKLsQnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oKLsRnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7wguhKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Xq0xwHkwEeiO-c_khjKlFQ" target="_7wgugKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7wguhaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wguiaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oKLsQ3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oKLsRHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oKLsRXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7wguhqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wguh6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wguiKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oKTBBHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_BDZzQIuXEeiu6boZkiJHCA" target="_oKTBAHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oKTBBXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oKTBCXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7wpRZKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BDZzQIuXEeiu6boZkiJHCA" target="_7wpRYKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7wpRZaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wpRaaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oKTBBnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oKTBB3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oKTBCHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7wpRZqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wpRZ6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wpRaKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oK3oxHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_-Be4sHkyEeiO-c_khjKlFQ" target="_oK3owHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oK3oxXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oK3oyXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7xp-BKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-Be4sHkyEeiO-c_khjKlFQ" target="_7xp-AKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7xp-BaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7xp-CaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oK3oxnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oK3ox3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oK3oyHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7xp-BqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7xp-B6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7xp-CKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oL3HRHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_oL3HQHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oL3HRXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oL3HSXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_7ztzgaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_7ztMcKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7ztzgqV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7ztzhqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oL3HRnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oL3HR3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oL3HSHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7ztzg6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ztzhKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ztzhaV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oM8sYXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_OBTyQJs8EeikSLSDi2qpXA" target="_oM8FUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oM8sYnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oM8sZnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_71ultKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_OBTyQJs8EeikSLSDi2qpXA" target="_71ulsKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_71ultaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_71uluaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oM8sY3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oM8sZHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oM8sZXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_71ultqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_71ult6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_71uluKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oNjJUHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_s3mNEJmTEeiOmuqNbykpsw" target="_oNiiQHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oNjJUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oNjJVXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_72tdJKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_s3mNEJmTEeiOmuqNbykpsw" target="_72tdIKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_72tdJaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_72tdKaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oNjJUnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oNjJU3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oNjJVHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_72tdJqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_72tdJ6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_72tdKKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oN8K4HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_8V3R4JmTEeiOmuqNbykpsw" target="_oN7j0HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oN8K4XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oN8K5XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_73guZKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8V3R4JmTEeiOmuqNbykpsw" target="_73guYKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_73guZaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_73guaaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oN8K4npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oN8K43pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oN8K5HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_73guZqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_73guZ6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_73guaKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oOCRhHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_VE_BkJmVEeiOmuqNbykpsw" target="_oOCRgHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oOCRhXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oOCRiXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_739aUKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_VE_BkJmVEeiOmuqNbykpsw" target="_738zQKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_739aUaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_739aVaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oOCRhnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oOCRh3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oOCRiHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_739aUqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_739aU6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_739aVKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_74JnlKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7O7aIG9zEeqLWtFsc04LIg" target="_74JnkKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_74JnlaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_74KOoqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_74JnlqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_74KOoKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_74KOoaV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oOoHZHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_EtIM4JmWEeiOmuqNbykpsw" target="_oOoHYHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oOoHZXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oOoHaXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_75nnNKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EtIM4JmWEeiOmuqNbykpsw" target="_75nnMKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_75nnNaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_75nnOaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oOoHZnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oOoHZ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oOoHaHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_75nnNqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_75nnN6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_75nnOKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oPFaY3pHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_nZkr4JmYEeiOmuqNbykpsw" target="_oPEzUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oPFaZHpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oPFaaHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_76slQKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_nZkr4JmYEeiOmuqNbykpsw" target="_76r-MKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_76slQaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_76slRaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oPFaZXpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oPFaZnpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oPFaZ3pHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_76slQqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_76slQ6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_76slRKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oPK59HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_ObaTQJmaEeiOmuqNbykpsw" target="_oPK58HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oPK59XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oPK5-XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_766ntKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ObaTQJmaEeiOmuqNbykpsw" target="_766nsKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_766ntaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_766nuaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oPK59npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oPK593pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oPK5-HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_766ntqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_766nt6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_766nuKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_77G09KV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_1zohAG9xEeqLWtFsc04LIg" target="_77G08KV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_77G09aV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_77G0-aV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_77G09qV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_77G096V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_77G0-KV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oPwv1HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_aw4GAJmYEeiOmuqNbykpsw" target="_oPwv0HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oPwv1XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oPwv2XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_777UVKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_aw4GAJmYEeiOmuqNbykpsw" target="_777UUKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_777UVaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_777UWaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oPwv1npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oPwv13pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oPwv2HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_777UVqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_777UV6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_777UWKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oQkBFHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_MlzdkJs8EeikSLSDi2qpXA" target="_oQkBEHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oQkBFXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oQkoIXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_78k0lKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_kK61oKE8EeqPrpdMOOTlbQ" target="_78k0kKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_78k0laV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_78lboqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oQkBFnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oQkBF3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oQkoIHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_78k0lqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_78lboKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_78lboaV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oRbjxHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_gP2P0Lq4EeimKvjOEffRIA" target="_oRbjwHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oRbjxXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oRbjyXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_79falKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MlzdkJs8EeikSLSDi2qpXA" target="_79fakKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_79falaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_79gBoKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oRbjxnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oRbjx3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oRbjyHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_79falqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_79fal6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_79famKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oSRRRHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_NzUVwLtKEeiljfl0umr-iQ" target="_oSRRQHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oSRRRXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oSRRSXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_7_CSsKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_gP2P0Lq4EeimKvjOEffRIA" target="_7_BroKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_7_CSsaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7_CStaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oSRRRnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oSRRR3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oSRRSHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7_CSsqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7_CSs6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7_CStKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oSjlJHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_hZNgsG9wEeqLWtFsc04LIg" target="_oSjlIHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oSjlJXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oSjlKXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_8A8XNKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_hZNgsG9wEeqLWtFsc04LIg" target="_8A8XMKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8A8XNaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8A8XOaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oSjlJnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oSjlJ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oSjlKHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8A8XNqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8A8XN6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8A8XOKV8EeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oTQItHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_YH1UkG9zEeqLWtFsc04LIg" target="_oTQIsHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oTQItXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oTQIuXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_8CM7caV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YH1UkG9zEeqLWtFsc04LIg" target="_8CMUYKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8CM7cqV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8CM7dqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oTQItnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oTQIt3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oTQIuHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8CM7c6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8CM7dKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8CM7daV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8D6LpKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_8D6LoKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8D6LpaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8D6LqaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8D6LpqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8D6Lp6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8D6LqKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8EmIIaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tsusAJCGEeq3cZ7vVOAmSw" target="_8ElhEKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8EmIIqV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8EmIJqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8EmII6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8EmIJKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8EmIJaV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8ExuUKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_osYdYKE2EeqPrpdMOOTlbQ" target="_8ExHQKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8ExuUaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8ExuVaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8ExuUqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8ExuU6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8ExuVKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8FWWFKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_8FWWEKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8FWWFaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8FWWGaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8FWWFqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8FWWF6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8FWWGKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8GHyJKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_z-f_8KE4EeqPrpdMOOTlbQ" target="_8GHyIKV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8GHyJaV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GHyKaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8GHyJqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GHyJ6V8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GHyKKV8EeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8GQVAaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_1ei2YKE4EeqPrpdMOOTlbQ" target="_8GPt8KV8EeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_8GQVAqV8EeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GQVBqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8GQVA6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GQVBKV8EeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GQVBaV8EeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_xbRtgHkvEeiO-c_khjKlFQ" type="PapyrusUMLClassDiagram" name="OtsiResourceSpec" measurementUnit="Pixel">
@@ -2496,7 +3022,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xbRv7XkvEeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xbRwInkvEeiO-c_khjKlFQ" x="620" y="-340" width="321" height="102"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xbRwInkvEeiO-c_khjKlFQ" x="620" y="-340" width="405" height="102"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_xbRyc3kvEeiO-c_khjKlFQ" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_xbRydHkvEeiO-c_khjKlFQ" type="Class_NameLabel"/>
@@ -2530,7 +3056,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xbRysXkvEeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xbRy5nkvEeiO-c_khjKlFQ" x="103" y="-320" width="309" height="121"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xbRy5nkvEeiO-c_khjKlFQ" x="103" y="-320" width="413" height="121"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_xbRzE3kvEeiO-c_khjKlFQ" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_xbRzFHkvEeiO-c_khjKlFQ" showTitle="true"/>
@@ -2961,7 +3487,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wHswM5s5EeikSLSDi2qpXA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wHswIZs5EeikSLSDi2qpXA" x="440" y="160" height="201"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wHswIZs5EeikSLSDi2qpXA" x="440" y="160" height="181"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_-2iRMJs7EeikSLSDi2qpXA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_-2iRMps7EeikSLSDi2qpXA" type="Class_NameLabel"/>
@@ -2995,7 +3521,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-2oX1Js7EeikSLSDi2qpXA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-2iRMZs7EeikSLSDi2qpXA" x="880" y="180" width="341" height="141"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-2iRMZs7EeikSLSDi2qpXA" x="880" y="180" width="341" height="112"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_SfGPYJtAEeikSLSDi2qpXA" type="StereotypeComment">
       <styles xsi:type="notation:TitleStyle" xmi:id="_SfGPYZtAEeikSLSDi2qpXA"/>
@@ -3117,133 +3643,138 @@
       <element xsi:nil="true"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z_3Rsrs8Eeiljfl0umr-iQ" x="781" y="-133"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nfnsUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nfnsUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nfnsU3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wDDisKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wDDisaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDDis6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3qhKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nfnsUnpHEeqOCchXc-J80w" x="443" y="-134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDDisqWZEeqJcvXkREZ1XQ" x="443" y="-134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ngRMkHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ngRMkXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ngRMk3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wDiD0KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wDiD0aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDiq4KWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ngRMknpHEeqOCchXc-J80w" x="443" y="-234"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDiD0qWZEeqJcvXkREZ1XQ" x="443" y="-234"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ngxi4HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ngxi4XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ngxi43pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wECaIKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wECaIaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wEDBMKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ngxi4npHEeqOCchXc-J80w" x="400" y="-480"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wECaIqWZEeqJcvXkREZ1XQ" x="400" y="-480"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nhi-8HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nhi-8XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nhi-83pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wEwy4KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wEwy4aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wExZ8KWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3tBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nhi-8npHEeqOCchXc-J80w" x="860" y="-160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wEwy4qWZEeqJcvXkREZ1XQ" x="860" y="-160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_niokEHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_niokEXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_niokE3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wGEacKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wGEacaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGEac6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_niokEnpHEeqOCchXc-J80w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGEacqWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nizjMHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nizjMXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nizjM3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wGQAoKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wGQAoaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGQnsKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nizjMnpHEeqOCchXc-J80w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGQAoqWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ni9UMHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ni9UMXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ni97QHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wGcN4KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wGcN4aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGc08KWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ni9UMnpHEeqOCchXc-J80w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGcN4qWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_njGeIHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_njGeIXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_njGeI3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wGobIKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wGobIaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGobI6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_njGeInpHEeqOCchXc-J80w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGobIqWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nj36MHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nj36MXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nj4hQHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wHc6gKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wHc6gaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wHc6g6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nj36MnpHEeqOCchXc-J80w" x="820" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wHc6gqWZEeqJcvXkREZ1XQ" x="820" y="-340"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nkWbUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nkXCYHpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nkXCYnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wICJUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wICJUaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wICJU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nkXCYXpHEeqOCchXc-J80w" x="820" y="-440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wICJUqWZEeqJcvXkREZ1XQ" x="820" y="-440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nk7qIHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nk7qIXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nk7qI3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wItewKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wItewaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wItew6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nk7qInpHEeqOCchXc-J80w" x="303" y="-320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wItewqWZEeqJcvXkREZ1XQ" x="303" y="-320"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nlhgAHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nlhgAXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nlhgA3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wJb3gKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wJb3gaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJb3g6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nlhgAnpHEeqOCchXc-J80w" x="303" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wJb3gqWZEeqJcvXkREZ1XQ" x="303" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nlnmoHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nlnmoXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nlnmo3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wJjzUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wJjzUaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJkaYKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nlnmonpHEeqOCchXc-J80w" x="303" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wJjzUqWZEeqJcvXkREZ1XQ" x="303" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nmH88HpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nmH88XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nmH883pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wKKQQKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wKKQQaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wKK3UKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qzTdgHk7EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nmH88npHEeqOCchXc-J80w" x="220" y="-20"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wKKQQqWZEeqJcvXkREZ1XQ" x="220" y="-20"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nna9cHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nna9cXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nna9c3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wL3gcKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wL3gcaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wL3gc6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nna9cnpHEeqOCchXc-J80w" x="640" y="160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wL3gcqWZEeqJcvXkREZ1XQ" x="640" y="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nompMHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nompMXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nonQQHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wNqQMKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wNqQMaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wNqQM6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nompMnpHEeqOCchXc-J80w" x="1080" y="180"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wNqQMqWZEeqJcvXkREZ1XQ" x="1080" y="180"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_wNDIAKWgEeqJcvXkREZ1XQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_wNDIAqWgEeqJcvXkREZ1XQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_wNB54KWgEeqJcvXkREZ1XQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wNDIAaWgEeqJcvXkREZ1XQ" x="-71" y="-384" height="50"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_xbR3JHkvEeiO-c_khjKlFQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_xbR3JXkvEeiO-c_khjKlFQ"/>
@@ -3254,32 +3785,32 @@
     <edges xsi:type="notation:Connector" xmi:id="_xbR3SXkvEeiO-c_khjKlFQ" type="Abstraction_Edge" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_xbRupnkvEeiO-c_khjKlFQ" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_xbR3SnkvEeiO-c_khjKlFQ" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_GZXLUIuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3S3kvEeiO-c_khjKlFQ" x="18" y="27"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3S3kvEeiO-c_khjKlFQ" x="12" y="118"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_xbR3THkvEeiO-c_khjKlFQ" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Gbvw8IuXEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3TXkvEeiO-c_khjKlFQ" x="-41" y="7"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3TXkvEeiO-c_khjKlFQ" x="-8" y="93"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_xbR3TnkvEeiO-c_khjKlFQ"/>
       <element href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xbR3UnkvEeiO-c_khjKlFQ" points="[620, -320, -643984, -643984]$[620, -361, -643984, -643984]$[600, -361, -643984, -643984]$[600, -411, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR3U3kvEeiO-c_khjKlFQ" id="(0.43613707165109034,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR3VHkvEeiO-c_khjKlFQ" id="(0.7952286282306164,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xbR3UnkvEeiO-c_khjKlFQ" points="[680, -340, -643984, -643984]$[680, -411, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR3U3kvEeiO-c_khjKlFQ" id="(0.14814814814814814,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR3VHkvEeiO-c_khjKlFQ" id="(0.9542743538767395,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_xbR393kvEeiO-c_khjKlFQ" type="Abstraction_Edge" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_xbRupnkvEeiO-c_khjKlFQ" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_xbR3-HkvEeiO-c_khjKlFQ" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2PXbMJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3-XkvEeiO-c_khjKlFQ" x="6" y="2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3-XkvEeiO-c_khjKlFQ" x="18" y="118"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_xbR3-nkvEeiO-c_khjKlFQ" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2SCUsJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3-3kvEeiO-c_khjKlFQ" x="-8" y="-7"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xbR3-3kvEeiO-c_khjKlFQ" x="-11" y="94"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_xbR3_HkvEeiO-c_khjKlFQ"/>
       <element href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xbR4AHkvEeiO-c_khjKlFQ" points="[300, -298, -643984, -643984]$[300, -335, -643984, -643984]$[300, -374, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR4AXkvEeiO-c_khjKlFQ" id="(0.6375404530744336,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR4AnkvEeiO-c_khjKlFQ" id="(0.15904572564612326,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xbR4AHkvEeiO-c_khjKlFQ" points="[401, -320, -643984, -643984]$[401, -411, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR4AXkvEeiO-c_khjKlFQ" id="(0.7215496368038741,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_xbR4AnkvEeiO-c_khjKlFQ" id="(0.3996023856858847,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_oJK2t3k0EeiO-c_khjKlFQ" type="StereotypeCommentLink" target="_oJK2s3k0EeiO-c_khjKlFQ">
       <styles xsi:type="notation:FontStyle" xmi:id="_oJK2uHk0EeiO-c_khjKlFQ"/>
@@ -3340,22 +3871,22 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_KmsHbYuXEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2v6jgJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KmsHbouXEeiu6boZkiJHCA" x="-13" y="-20"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KmsHbouXEeiu6boZkiJHCA" x="-18" y="25"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_KmsHYYuXEeiu6boZkiJHCA"/>
       <element href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_KmsHYouXEeiu6boZkiJHCA" points="[232, -219, -643984, -643984]$[175, -129, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LmPf4IuXEeiu6boZkiJHCA" id="(0.11974110032362459,1.0)"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LmPf4IuXEeiu6boZkiJHCA" id="(0.08958837772397095,1.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SdU-8G9qEeqLWtFsc04LIg" id="(0.37383177570093457,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_MtNH8IuXEeiu6boZkiJHCA" type="Association_Edge" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_xbRyc3kvEeiO-c_khjKlFQ">
       <children xsi:type="notation:DecorationNode" xmi:id="_MtNH84uXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2yA1QJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MtNH9IuXEeiu6boZkiJHCA" x="-10" y="-6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MtNH9IuXEeiu6boZkiJHCA" x="-14" y="108"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_MtNH9YuXEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_20BAYJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MtNH9ouXEeiu6boZkiJHCA" x="11" y="-6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MtNH9ouXEeiu6boZkiJHCA" x="15" y="118"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_MtNH94uXEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_22fsoJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3367,7 +3898,7 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_MtNH-4uXEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_26sQIJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MtNH_IuXEeiu6boZkiJHCA" x="16" y="-14"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MtNH_IuXEeiu6boZkiJHCA" x="16" y="-24"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_MtNH_YuXEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_29pdgJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3377,16 +3908,16 @@
       <element href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MtNH8ouXEeiu6boZkiJHCA" points="[331, -134, -643984, -643984]$[280, -219, -643984, -643984]"/>
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FDBggG9rEeqLWtFsc04LIg" id="(0.3489208633093525,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PIYw8IuXEeiu6boZkiJHCA" id="(0.7669902912621359,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PIYw8IuXEeiu6boZkiJHCA" id="(0.5738498789346247,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_QoX9AIuXEeiu6boZkiJHCA" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_xbRvg3kvEeiO-c_khjKlFQ">
+    <edges xsi:type="notation:Connector" xmi:id="_QoX9AIuXEeiu6boZkiJHCA" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_xbRvg3kvEeiO-c_khjKlFQ" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_QoX9A4uXEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2Ua6UJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoX9BIuXEeiu6boZkiJHCA" x="-2" y="-1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoX9BIuXEeiu6boZkiJHCA" x="-2" y="131"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_QoYkEIuXEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2WnSsJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoYkEYuXEeiu6boZkiJHCA" x="14" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoYkEYuXEeiu6boZkiJHCA" x="16" y="120"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_QoYkEouXEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2ZF-8Jo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3398,26 +3929,26 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_QoYkFouXEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2dNC4Jo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoYkF4uXEeiu6boZkiJHCA" x="13" y="36"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoYkF4uXEeiu6boZkiJHCA" x="20" y="-29"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_QoYkGIuXEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2f38YJo3EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoYkGYuXEeiu6boZkiJHCA" x="-8" y="18"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QoYkGYuXEeiu6boZkiJHCA" x="-15" y="-22"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_QoX9AYuXEeiu6boZkiJHCA"/>
       <element href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_QoX9AouXEeiu6boZkiJHCA" points="[534, -65, -643984, -643984]$[552, -219, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SIuVcIuXEeiu6boZkiJHCA" id="(0.32085561497326204,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RzyAMIuXEeiu6boZkiJHCA" id="(0.5607476635514018,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_QoX9AouXEeiu6boZkiJHCA" points="[800, -160, -643984, -643984]$[800, -238, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SIuVcIuXEeiu6boZkiJHCA" id="(0.24955436720142601,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RzyAMIuXEeiu6boZkiJHCA" id="(0.4444444444444444,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_zM5mgJs5EeikSLSDi2qpXA" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_wHswIJs5EeikSLSDi2qpXA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_zM5mg5s5EeikSLSDi2qpXA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_zqL_cJs5EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mhJs5EeikSLSDi2qpXA" x="6" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mhJs5EeikSLSDi2qpXA" x="40" y="15"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zM5mhZs5EeikSLSDi2qpXA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_zsklEJs5EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mhps5EeikSLSDi2qpXA" x="46" y="29"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mhps5EeikSLSDi2qpXA" x="-33" y="22"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zM5mh5s5EeikSLSDi2qpXA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_zuq20Js5EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3429,26 +3960,26 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zM5mi5s5EeikSLSDi2qpXA" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_zzvkEJs5EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mjJs5EeikSLSDi2qpXA" x="8" y="16"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mjJs5EeikSLSDi2qpXA" x="17" y="-25"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_zM5mjZs5EeikSLSDi2qpXA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_z178cJs5EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mjps5EeikSLSDi2qpXA" x="-14" y="16"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zM5mjps5EeikSLSDi2qpXA" x="-16" y="-27"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_zM5mgZs5EeikSLSDi2qpXA"/>
       <element href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_zM5mgps5EeikSLSDi2qpXA" points="[660, 81, -643984, -643984]$[560, 81, -643984, -643984]$[560, 160, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zRw4YJs5EeikSLSDi2qpXA" id="(0.0,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zRw4YZs5EeikSLSDi2qpXA" id="(0.3508771929824561,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_zM5mgps5EeikSLSDi2qpXA" points="[660, 24, -643984, -643984]$[555, 24, -643984, -643984]$[555, 160, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zRw4YJs5EeikSLSDi2qpXA" id="(0.0,0.7551867219917012)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zRw4YZs5EeikSLSDi2qpXA" id="(0.3362573099415205,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_2HPJUJs8EeikSLSDi2qpXA" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_-2iRMJs7EeikSLSDi2qpXA">
+    <edges xsi:type="notation:Connector" xmi:id="_2HPJUJs8EeikSLSDi2qpXA" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_-2iRMJs7EeikSLSDi2qpXA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_2HPJU5s8EeikSLSDi2qpXA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_d6dGwLqtEeimKvjOEffRIA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJVJs8EeikSLSDi2qpXA" x="7" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJVJs8EeikSLSDi2qpXA" x="1" y="84"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_2HPJVZs8EeikSLSDi2qpXA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_d9jeELqtEeimKvjOEffRIA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJVps8EeikSLSDi2qpXA" x="-5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJVps8EeikSLSDi2qpXA" x="-19" y="119"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_2HPJV5s8EeikSLSDi2qpXA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eAy_ULqtEeimKvjOEffRIA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3460,26 +3991,26 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_2HPJW5s8EeikSLSDi2qpXA" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eG61cLqtEeimKvjOEffRIA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJXJs8EeikSLSDi2qpXA" x="9" y="20"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJXJs8EeikSLSDi2qpXA" x="12" y="-19"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_2HPJXZs8EeikSLSDi2qpXA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eK9A4LqtEeimKvjOEffRIA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJXps8EeikSLSDi2qpXA" x="-10" y="23"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2HPJXps8EeikSLSDi2qpXA" x="-12" y="-17"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_2HPJUZs8EeikSLSDi2qpXA"/>
       <element href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2HPJUps8EeikSLSDi2qpXA" points="[599, 73, -643984, -643984]$[600, 151, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Mk8UJs8EeikSLSDi2qpXA" id="(0.39215686274509803,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Mk8UZs8EeikSLSDi2qpXA" id="(0.11730205278592376,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_2HPJUps8EeikSLSDi2qpXA" points="[960, 81, -643984, -643984]$[960, 180, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Mk8UJs8EeikSLSDi2qpXA" id="(0.5347593582887701,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2Mk8UZs8EeikSLSDi2qpXA" id="(0.23460410557184752,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Y349MLucEeiljfl0umr-iQ" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_-2iRMJs7EeikSLSDi2qpXA">
+    <edges xsi:type="notation:Connector" xmi:id="_Y349MLucEeiljfl0umr-iQ" type="Association_Edge" source="_xbRu43kvEeiO-c_khjKlFQ" target="_-2iRMJs7EeikSLSDi2qpXA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_Y349M7ucEeiljfl0umr-iQ" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_b7FocLucEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y349NLucEeiljfl0umr-iQ" x="5" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y349NLucEeiljfl0umr-iQ" x="1" y="-92"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_Y349NbucEeiljfl0umr-iQ" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_b_K3MLucEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y349NrucEeiljfl0umr-iQ" x="-9"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y349NrucEeiljfl0umr-iQ" x="-21" y="-107"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_Y349N7ucEeiljfl0umr-iQ" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cC7V0LucEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3499,169 +4030,169 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_Y349MbucEeiljfl0umr-iQ"/>
       <element href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Y349MrucEeiljfl0umr-iQ" points="[621, 103, -643984, -643984]$[623, 183, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49ELucEeiljfl0umr-iQ" id="(0.6773618538324421,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Y349MrucEeiljfl0umr-iQ" points="[1080, 81, -643984, -643984]$[1080, 180, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49ELucEeiljfl0umr-iQ" id="(0.7486631016042781,1.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49EbucEeiljfl0umr-iQ" id="(0.5865102639296188,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nfoTYHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_nfnsUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nfoTYXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nfoTZXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wDDitKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_wDDisKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wDDitaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDEJwqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3qhKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nfoTYnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nfoTY3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nfoTZHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wDDitqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDEJwKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDEJwaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ngRMlHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_MtNH8IuXEeiu6boZkiJHCA" target="_ngRMkHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ngRMlXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ngRMmXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wDiq4aWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MtNH8IuXEeiu6boZkiJHCA" target="_wDiD0KWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wDiq4qWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDiq5qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ngRMlnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ngRMl3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ngRMmHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wDiq46WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDiq5KWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDiq5aWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ngxi5HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbRupnkvEeiO-c_khjKlFQ" target="_ngxi4HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ngxi5XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ngxi6XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wEDBMaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRupnkvEeiO-c_khjKlFQ" target="_wECaIKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wEDBMqWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wEDBNqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ngxi5npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ngxi53pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ngxi6HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wEDBM6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wEDBNKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wEDBNaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nhi-9HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbRu43kvEeiO-c_khjKlFQ" target="_nhi-8HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nhi-9XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nhi--XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wExZ8aWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRu43kvEeiO-c_khjKlFQ" target="_wEwy4KWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wExZ8qWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wExZ9qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3tBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nhi-9npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nhi-93pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nhi--HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wExZ86WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wExZ9KWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wExZ9aWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_niokFHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_QoX9AIuXEeiu6boZkiJHCA" target="_niokEHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_niokFXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_niokGXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wGEadKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QoX9AIuXEeiu6boZkiJHCA" target="_wGEacKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wGEadaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGEaeaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_niokFnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_niokF3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_niokGHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGEadqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGEad6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGEaeKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nizjNHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_zM5mgJs5EeikSLSDi2qpXA" target="_nizjMHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nizjNXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nizjOXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wGQnsaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_zM5mgJs5EeikSLSDi2qpXA" target="_wGQAoKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wGQnsqWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGQntqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nizjNnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nizjN3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nizjOHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGQns6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGQntKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGQntaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ni97QXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_2HPJUJs8EeikSLSDi2qpXA" target="_ni9UMHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ni97QnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ni97RnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wGc08aWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_2HPJUJs8EeikSLSDi2qpXA" target="_wGcN4KWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wGc08qWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGc09qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ni97Q3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ni97RHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ni97RXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGc086WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGc09KWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGc09aWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_njGeJHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_Y349MLucEeiljfl0umr-iQ" target="_njGeIHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_njGeJXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_njGeKXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wGobJKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Y349MLucEeiljfl0umr-iQ" target="_wGobIKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wGobJaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGobKaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_njGeJnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_njGeJ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_njGeKHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGobJqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGobJ6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGobKKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nj4hQXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_nj36MHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nj4hQnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nj4hRnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wHc6hKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_wHc6gKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wHc6haWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wHc6iaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nj4hQ3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nj4hRHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nj4hRXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wHc6hqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wHc6h6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wHc6iKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nkXCY3pHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbR3SXkvEeiO-c_khjKlFQ" target="_nkWbUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nkXCZHpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nkXCaHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wICJVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbR3SXkvEeiO-c_khjKlFQ" target="_wICJUKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wICJVaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wICJWaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nkXCZXpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nkXCZnpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nkXCZ3pHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wICJVqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wICJV6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wICJWKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nk7qJHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_nk7qIHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nk7qJXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nk7qKXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wIuF0KWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_wItewKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wIuF0aWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wIuF1aWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nk7qJnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nk7qJ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nk7qKHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wIuF0qWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wIuF06WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wIuF1KWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nlhgBHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_xbR393kvEeiO-c_khjKlFQ" target="_nlhgAHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nlhgBXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nlhgCXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wJcekKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbR393kvEeiO-c_khjKlFQ" target="_wJb3gKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wJcekaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJcelaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nlhgBnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nlhgB3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nlhgCHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wJcekqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJcek6WZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJcelKWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nlnmpHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_KmsHYIuXEeiu6boZkiJHCA" target="_nlnmoHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nlnmpXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nlnmqXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wJkaYaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_KmsHYIuXEeiu6boZkiJHCA" target="_wJjzUKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wJkaYqWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJkaZqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nlnmpnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nlnmp3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nlnmqHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wJkaY6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJkaZKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJkaZaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nmH89HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_sregEHk7EeiO-c_khjKlFQ" target="_nmH88HpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nmH89XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nmH8-XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wKK3UaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_sregEHk7EeiO-c_khjKlFQ" target="_wKKQQKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wKK3UqWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wKK3VqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qzTdgHk7EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nmH89npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nmH893pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nmH8-HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wKK3U6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wKK3VKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wKK3VaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nna9dHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_wHswIJs5EeikSLSDi2qpXA" target="_nna9cHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nna9dXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nna9eXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wL3gdKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_wHswIJs5EeikSLSDi2qpXA" target="_wL3gcKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wL3gdaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wL4HgqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nna9dnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nna9d3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nna9eHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wL3gdqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wL4HgKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wL4HgaWZEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_nonQQXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_-2iRMJs7EeikSLSDi2qpXA" target="_nompMHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_nonQQnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nonQRnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_wNqQNKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-2iRMJs7EeikSLSDi2qpXA" target="_wNqQMKWZEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_wNqQNaWZEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wNq3QqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nonQQ3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nonQRHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nonQRXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wNqQNqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wNq3QKWZEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wNq3QaWZEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_3bpg4IoMEeivCevppATXng" type="PapyrusUMLClassDiagram" name="McResourceSpec" measurementUnit="Pixel">
@@ -3689,7 +4220,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SvF9g5ozEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SvF9cZozEeiOmuqNbykpsw" x="382" y="-442" width="559" height="65"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SvF9cZozEeiOmuqNbykpsw" x="454" y="-442" width="614" height="65"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_aiK4MJozEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_aiK4MpozEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -3719,7 +4250,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aiK4Q5ozEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aiK4MZozEeiOmuqNbykpsw" x="640" y="-280" height="121"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aiK4MZozEeiOmuqNbykpsw" x="427" y="-53" height="121"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_a2-DgpozEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_a2-DhJozEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -3749,7 +4280,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a2-DlZozEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a2-Dg5ozEeiOmuqNbykpsw" x="1000" y="-160" height="101"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a2-Dg5ozEeiOmuqNbykpsw" x="927" y="-51" height="101"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_lvNYYJozEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_lvNYYpozEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -3793,7 +4324,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lvNYc5ozEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lvNYYZozEeiOmuqNbykpsw" x="540" y="-40" width="441" height="141"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lvNYYZozEeiOmuqNbykpsw" x="609" y="148" width="441" height="141"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_F5DNQpo1EeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_F5DNQ5o1EeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -3819,7 +4350,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_F5DNVJo1EeiOmuqNbykpsw"/>
       </children>
       <element href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_F5DNfpo1EeiOmuqNbykpsw" x="-83" y="-448" width="277" height="65"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_F5DNfpo1EeiOmuqNbykpsw" x="-83" y="-448" width="250" height="65"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_F5JT0Jo1EeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_F5JT0Zo1EeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -3913,7 +4444,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WDV_CZqMEeid4dfn4JFJZg"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WDKY0ZqMEeid4dfn4JFJZg" x="320" y="-240" height="101"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WDKY0ZqMEeid4dfn4JFJZg" x="409" y="-244" height="101"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_asvRIJs-EeikSLSDi2qpXA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_asvRIps-EeikSLSDi2qpXA" type="Class_NameLabel"/>
@@ -3947,151 +4478,156 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_asvRM5s-EeikSLSDi2qpXA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_asvRIZs-EeikSLSDi2qpXA" x="580" y="200" width="303" height="121"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_asvRIZs-EeikSLSDi2qpXA" x="675" y="392" width="303" height="121"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n2PckHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n2PckXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n2Pck3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hMgIsKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hMgIsaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hMgIs6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n2PcknpHEeqOCchXc-J80w" x="582" y="-442"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hMgIsqWaEeqJcvXkREZ1XQ" x="582" y="-442"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n2_qgHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n2_qgXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n2_qg3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hNOhcKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hNOhcaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNOhc6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n2_qgnpHEeqOCchXc-J80w" x="840" y="-280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hNOhcqWaEeqJcvXkREZ1XQ" x="840" y="-280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n3fZwHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n3fZwXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n3fZw3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hNr0cKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hNr0caWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNr0c6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n3fZwnpHEeqOCchXc-J80w" x="840" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hNr0cqWaEeqJcvXkREZ1XQ" x="840" y="-380"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n3k5UHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n3k5UXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n3k5U3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hNxUAKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hNxUAaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNxUA6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n3k5UnpHEeqOCchXc-J80w" x="840" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hNxUAqWaEeqJcvXkREZ1XQ" x="840" y="-380"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n4MkYHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n4MkYXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4MkY3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hOUtoKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hOUtoaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOUto6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4MkYnpHEeqOCchXc-J80w" x="1200" y="-160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hOUtoqWaEeqJcvXkREZ1XQ" x="1200" y="-160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n4sToHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n4sToXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4sTo3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hOzOwKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hOzOwaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOzOw6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4sTonpHEeqOCchXc-J80w" x="1200" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hOzOwqWaEeqJcvXkREZ1XQ" x="1200" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n4xzMHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n4xzMXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4xzM3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hO5VYKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hO5VYaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hO5VY6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4xzMnpHEeqOCchXc-J80w" x="1200" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hO5VYqWaEeqJcvXkREZ1XQ" x="1200" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n5TXoHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n5TXoXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n5TXo3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hPfLQKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hPfLQaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hPfLQ6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n5TXonpHEeqOCchXc-J80w" x="740" y="-40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hPfLQqWaEeqJcvXkREZ1XQ" x="740" y="-40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n6BJUHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n6BJUXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n6BwYHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hQQnUKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hQQnUaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQROYKWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n6BJUnpHEeqOCchXc-J80w" x="740" y="-140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hQQnUqWaEeqJcvXkREZ1XQ" x="740" y="-140"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n6JsMHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n6JsMXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n6KTQHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hQepwKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hQepwaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQepw6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n6JsMnpHEeqOCchXc-J80w" x="740" y="-140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hQepwqWaEeqJcvXkREZ1XQ" x="740" y="-140"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n6lKAHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n6lKAXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n6lKA3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hRGU0KWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hRGU0aWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hRGU06WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n6lKAnpHEeqOCchXc-J80w" x="117" y="-448"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hRGU0qWaEeqJcvXkREZ1XQ" x="117" y="-448"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n7X0MHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n7X0MXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n7X0M3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hSI2oKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hSI2oaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSI2o6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n7X0MnpHEeqOCchXc-J80w" x="109" y="-294"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hSI2oqWaEeqJcvXkREZ1XQ" x="109" y="-294"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n75_sHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n75_sXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n75_s3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hSy98KWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hSy98aWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSy986WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n75_snpHEeqOCchXc-J80w" x="109" y="-394"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hSy98qWaEeqJcvXkREZ1XQ" x="109" y="-394"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n8BUcHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n8BUcXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n8B7gHpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hS65wKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hS65waWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hS65w6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hv9NsNnYEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n8BUcnpHEeqOCchXc-J80w" x="109" y="-394"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hS65wqWaEeqJcvXkREZ1XQ" x="109" y="-394"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n8q0sHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n8q0sXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n8q0s3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hTik0KWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hTik0aWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hTik06WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n8q0snpHEeqOCchXc-J80w" x="160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hTik0qWaEeqJcvXkREZ1XQ" x="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n9zdIHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n9zdIXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n9zdI3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hUsbYKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hUsbYaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hUsbY6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n9zdInpHEeqOCchXc-J80w" x="520" y="-240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hUsbYqWaEeqJcvXkREZ1XQ" x="520" y="-240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n-INQHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n-INQXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n-INQ3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hVCZoKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hVCZoaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVCZo6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n-INQnpHEeqOCchXc-J80w" x="520" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hVCZoqWaEeqJcvXkREZ1XQ" x="520" y="-340"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n-0JwHpHEeqOCchXc-J80w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n-0JwXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n-0Jw3pHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_hVqEsKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hVqEsaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVqrwKWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n-0JwnpHEeqOCchXc-J80w" x="780" y="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hVqEsqWaEeqJcvXkREZ1XQ" x="780" y="200"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_gQsLQKWbEeqJcvXkREZ1XQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_gQtZYKWbEeqJcvXkREZ1XQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_gQZQUKWbEeqJcvXkREZ1XQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gQsLQaWbEeqJcvXkREZ1XQ" x="482" y="-283" height="34"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_3bpg4YoMEeivCevppATXng" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_3bpg4ooMEeivCevppATXng"/>
@@ -4102,32 +4638,32 @@
     <edges xsi:type="notation:Connector" xmi:id="_c-z5wZozEeiOmuqNbykpsw" type="Abstraction_Edge" source="_aiK4MJozEeiOmuqNbykpsw" target="_SvF9cJozEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_c-z5xJozEeiOmuqNbykpsw" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_I9qDIJo0EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_c-z5xZozEeiOmuqNbykpsw" x="5" y="6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_c-z5xZozEeiOmuqNbykpsw" x="-73" y="109"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_c-z5xpozEeiOmuqNbykpsw" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_I-a4IJo0EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_c-z5x5ozEeiOmuqNbykpsw" x="-14" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_c-z5x5ozEeiOmuqNbykpsw" x="-99" y="97"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_c-z5wpozEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c-z5w5ozEeiOmuqNbykpsw" points="[800, -295, -643984, -643984]$[800, -340, -643984, -643984]$[740, -340, -643984, -643984]$[740, -377, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c_q1YJozEeiOmuqNbykpsw" id="(0.6326034063260341,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c_q1YZozEeiOmuqNbykpsw" id="(0.6404293381037567,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c-z5w5ozEeiOmuqNbykpsw" points="[739, -53, -643984, -643984]$[739, -377, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c_q1YJozEeiOmuqNbykpsw" id="(0.7591240875912408,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c_q1YZozEeiOmuqNbykpsw" id="(0.46416938110749184,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_dbbkUJozEeiOmuqNbykpsw" type="Abstraction_Edge" source="_a2-DgpozEeiOmuqNbykpsw" target="_SvF9cJozEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_dbbkU5ozEeiOmuqNbykpsw" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Jl7kEJo0EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVJozEeiOmuqNbykpsw" x="13" y="-3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVJozEeiOmuqNbykpsw" x="98" y="110"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_dbbkVZozEeiOmuqNbykpsw" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JmgL0Jo0EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVpozEeiOmuqNbykpsw" x="-7" y="-6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVpozEeiOmuqNbykpsw" x="69" y="94"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_dbbkUZozEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dbbkUpozEeiOmuqNbykpsw" points="[940, -292, -643984, -643984]$[940, -340, -643984, -643984]$[920, -340, -643984, -643984]$[920, -377, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dcZNoJozEeiOmuqNbykpsw" id="(0.22935779816513763,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dcZNoZozEeiOmuqNbykpsw" id="(0.962432915921288,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dbbkUpozEeiOmuqNbykpsw" points="[993, -51, -643984, -643984]$[993, -377, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dcZNoJozEeiOmuqNbykpsw" id="(0.1559633027522936,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dcZNoZozEeiOmuqNbykpsw" id="(0.8811074918566775,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_qPcpYJozEeiOmuqNbykpsw" type="Association_Edge" source="_aiK4MJozEeiOmuqNbykpsw" target="_lvNYYJozEeiOmuqNbykpsw" routing="Rectilinear">
       <eAnnotations xmi:id="_vKZgcJozEeiOmuqNbykpsw" source="PapyrusCSSForceValue">
@@ -4135,11 +4671,11 @@
       </eAnnotations>
       <children xsi:type="notation:DecorationNode" xmi:id="_qPcpY5ozEeiOmuqNbykpsw" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="__LT_UJozEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qPcpZJozEeiOmuqNbykpsw" x="7" y="6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qPcpZJozEeiOmuqNbykpsw" x="2" y="87"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_qPcpZZozEeiOmuqNbykpsw" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="__L4nEJozEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qPcpZpozEeiOmuqNbykpsw" x="-7" y="4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qPcpZpozEeiOmuqNbykpsw" x="-21" y="92"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_qPcpZ5ozEeiOmuqNbykpsw" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="__MdO0JozEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4159,18 +4695,18 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_qPcpYZozEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qPcpYpozEeiOmuqNbykpsw" points="[779, -221, -643984, -643984]$[779, -180, -643984, -643984]$[720, -180, -643984, -643984]$[720, -125, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qQr_gJozEeiOmuqNbykpsw" id="(0.5352798053527981,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qQr_gZozEeiOmuqNbykpsw" id="(0.54421768707483,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qPcpYpozEeiOmuqNbykpsw" points="[725, 68, -643984, -643984]$[725, 148, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qQr_gJozEeiOmuqNbykpsw" id="(0.7250608272506083,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qQr_gZozEeiOmuqNbykpsw" id="(0.26303854875283444,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_quGUQJozEeiOmuqNbykpsw" type="Association_Edge" source="_a2-DgpozEeiOmuqNbykpsw" target="_lvNYYJozEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_quGUQ5ozEeiOmuqNbykpsw" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="__PCBsJozEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_quGURJozEeiOmuqNbykpsw" x="-81" y="6"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_quGURJozEeiOmuqNbykpsw" x="7" y="-84"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_quGURZozEeiOmuqNbykpsw" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="__P49UJozEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_quGURpozEeiOmuqNbykpsw" x="-99" y="8"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_quGURpozEeiOmuqNbykpsw" x="-19" y="-84"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_quGUR5ozEeiOmuqNbykpsw" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="__QpyUJozEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4190,24 +4726,24 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_quGUQZozEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_quGUQpozEeiOmuqNbykpsw" points="[1200, -91, -643984, -643984]$[1200, -80, -643984, -643984]$[990, -80, -643984, -643984]$[990, 60, -643984, -643984]$[936, 60, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qvbxAJozEeiOmuqNbykpsw" id="(0.0,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qvbxAZozEeiOmuqNbykpsw" id="(1.0,0.28368794326241137)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_quGUQpozEeiOmuqNbykpsw" points="[991, 50, -643984, -643984]$[991, 148, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qvbxAJozEeiOmuqNbykpsw" id="(0.15137614678899083,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qvbxAZozEeiOmuqNbykpsw" id="(0.8707482993197279,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_F5DNMJo1EeiOmuqNbykpsw" type="Abstraction_Edge" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_F5DNQpo1EeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_F5DNMZo1EeiOmuqNbykpsw" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F5DNMpo1EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_F5DNM5o1EeiOmuqNbykpsw" x="4" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_F5DNM5o1EeiOmuqNbykpsw" x="8" y="122"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_F5DNNJo1EeiOmuqNbykpsw" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F5DNNZo1EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_F5DNNpo1EeiOmuqNbykpsw" x="-14" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_F5DNNpo1EeiOmuqNbykpsw" x="-13" y="97"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_F5DNN5o1EeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_F5DNO5o1EeiOmuqNbykpsw" points="[46, -294, -643984, -643984]$[46, -383, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_F5DNPJo1EeiOmuqNbykpsw" id="(0.4884910485933504,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_F5DNPZo1EeiOmuqNbykpsw" id="(0.4657039711191336,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_F5DNO5o1EeiOmuqNbykpsw" points="[5, -294, -643984, -643984]$[5, -383, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_F5DNPJo1EeiOmuqNbykpsw" id="(0.24296675191815856,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_F5DNPZo1EeiOmuqNbykpsw" id="(0.348,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_F5JURJo1EeiOmuqNbykpsw" type="Association_Edge" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_F5JUXpo1EeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_F5JURZo1EeiOmuqNbykpsw" type="Association_StereotypeLabel">
@@ -4243,26 +4779,26 @@
     <edges xsi:type="notation:Connector" xmi:id="_dkQywJqMEeid4dfn4JFJZg" type="Abstraction_Edge" source="_WDKY0JqMEeid4dfn4JFJZg" target="_SvF9cJozEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_dkQyw5qMEeid4dfn4JFJZg" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_88LQ0JqMEeid4dfn4JFJZg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dkQyxJqMEeid4dfn4JFJZg" x="9" y="-4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dkQyxJqMEeid4dfn4JFJZg" x="36" y="60"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_dkRZ0JqMEeid4dfn4JFJZg" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8_JsUJqMEeid4dfn4JFJZg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dkRZ0ZqMEeid4dfn4JFJZg" x="-11" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dkRZ0ZqMEeid4dfn4JFJZg" x="14" y="92"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_dkQywZqMEeid4dfn4JFJZg"/>
       <element href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dkQywpqMEeid4dfn4JFJZg" points="[460, -291, -643984, -643984]$[460, -340, -643984, -643984]$[420, -340, -643984, -643984]$[420, -377, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dpnM0JqMEeid4dfn4JFJZg" id="(0.4671814671814672,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dpnM0ZqMEeid4dfn4JFJZg" id="(0.06797853309481217,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dkQywpqMEeid4dfn4JFJZg" points="[486, -244, -643984, -643984]$[486, -311, -643984, -643984]$[478, -311, -643984, -643984]$[478, -377, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dpnM0JqMEeid4dfn4JFJZg" id="(0.26640926640926643,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dpnM0ZqMEeid4dfn4JFJZg" id="(0.03908794788273615,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_avUEAJs-EeikSLSDi2qpXA" type="Association_Edge" source="_lvNYYJozEeiOmuqNbykpsw" target="_asvRIJs-EeikSLSDi2qpXA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_avUEA5s-EeikSLSDi2qpXA" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bKoHAJs-EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_avUEBJs-EeikSLSDi2qpXA" x="5" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_avUEBJs-EeikSLSDi2qpXA" x="8" y="80"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_avUEBZs-EeikSLSDi2qpXA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bMcE4Js-EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_avUEBps-EeikSLSDi2qpXA" x="-8" y="-5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_avUEBps-EeikSLSDi2qpXA" x="-13" y="114"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_avUEB5s-EeikSLSDi2qpXA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bOJ8IJs-EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4282,40 +4818,9 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_avUEAZs-EeikSLSDi2qpXA"/>
       <element href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_avUEAps-EeikSLSDi2qpXA" points="[640, -40, -643984, -643984]$[600, -40, -643984, -643984]$[600, 3, -643984, -643984]$[700, 3, -643984, -643984]$[700, 180, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bXhTgJs-EeikSLSDi2qpXA" id="(0.1360544217687075,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bXhTgZs-EeikSLSDi2qpXA" id="(0.19801980198019803,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PPGIgLtQEeiljfl0umr-iQ" type="Association_Edge" source="_SvF9cJozEeiOmuqNbykpsw" target="_SvF9cJozEeiOmuqNbykpsw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_PPH9sLtQEeiljfl0umr-iQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_QkOIYLtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_PPH9sbtQEeiljfl0umr-iQ" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_PPH9srtQEeiljfl0umr-iQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Qn-nALtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_PPH9s7tQEeiljfl0umr-iQ" y="6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_PPH9tLtQEeiljfl0umr-iQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_QrvssLtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_PPH9tbtQEeiljfl0umr-iQ" x="46" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_PPH9trtQEeiljfl0umr-iQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_QvxRELtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_PPH9t7tQEeiljfl0umr-iQ" x="-48" y="17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_PPH9uLtQEeiljfl0umr-iQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Qz7YULtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_PPH9ubtQEeiljfl0umr-iQ" x="8" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_PPH9urtQEeiljfl0umr-iQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Q2_TYLtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_PPH9u7tQEeiljfl0umr-iQ" x="-11" y="-14"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_PPGIgbtQEeiljfl0umr-iQ"/>
-      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PPGIgrtQEeiljfl0umr-iQ" points="[529, -377, -643984, -643984]$[529, -343, -643984, -643984]$[605, -343, -643984, -643984]$[605, -377, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_QhXBoLtQEeiljfl0umr-iQ" id="(0.26475849731663686,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_QhXosLtQEeiljfl0umr-iQ" id="(0.39892665474060823,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_avUEAps-EeikSLSDi2qpXA" points="[757, 289, -643984, -643984]$[757, 392, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bXhTgJs-EeikSLSDi2qpXA" id="(0.3356009070294785,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bXhTgZs-EeikSLSDi2qpXA" id="(0.2706270627062706,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_cumakLtQEeiljfl0umr-iQ" type="Association_Edge" source="_WDKY0JqMEeid4dfn4JFJZg" target="_aiK4MJozEeiOmuqNbykpsw" routing="Rectilinear" lineColor="0">
       <eAnnotations xmi:id="_QwSRgMG-EeiAg83ctgK3eQ" source="PapyrusCSSForceValue">
@@ -4327,7 +4832,7 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_cunBortQEeiljfl0umr-iQ" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_dUHicLtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cunBo7tQEeiljfl0umr-iQ" x="-31" y="31"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cunBo7tQEeiljfl0umr-iQ" x="3" y="134"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_cunBpLtQEeiljfl0umr-iQ" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_dW_3ULtQEeiljfl0umr-iQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4347,18 +4852,18 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_cumakbtQEeiljfl0umr-iQ"/>
       <element href="TapiPhotonicMedia.uml#_crzlQLtQEeiljfl0umr-iQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cumakrtQEeiljfl0umr-iQ" points="[460, -229, -643984, -643984]$[460, -190, -643984, -643984]$[583, -190, -643984, -643984]$[583, -126, -643984, -643984]$[600, -126, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c0YScLtQEeiljfl0umr-iQ" id="(1.0,0.594059405940594)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c0YScbtQEeiljfl0umr-iQ" id="(0.0,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cumakrtQEeiljfl0umr-iQ" points="[564, -143, -643984, -643984]$[564, -53, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c0YScLtQEeiljfl0umr-iQ" id="(0.6061776061776062,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c0YScbtQEeiljfl0umr-iQ" id="(0.3381995133819951,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_tTykMLudEeiljfl0umr-iQ" type="Association_Edge" source="_lvNYYJozEeiOmuqNbykpsw" target="_asvRIJs-EeikSLSDi2qpXA">
+    <edges xsi:type="notation:Connector" xmi:id="_tTykMLudEeiljfl0umr-iQ" type="Association_Edge" source="_lvNYYJozEeiOmuqNbykpsw" target="_asvRIJs-EeikSLSDi2qpXA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_tTykM7udEeiljfl0umr-iQ" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ac1gQG93EeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_tTykNLudEeiljfl0umr-iQ" x="7" y="4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tTykNLudEeiljfl0umr-iQ" x="9" y="-87"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_tTykNbudEeiljfl0umr-iQ" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_aejXgG93EeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_tTykNrudEeiljfl0umr-iQ" x="-7" y="4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_tTykNrudEeiljfl0umr-iQ" x="-18" y="-101"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_tTzLQLudEeiljfl0umr-iQ" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_agwW8G93EeqLWtFsc04LIg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4378,8 +4883,8 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_tTykMbudEeiljfl0umr-iQ"/>
       <element href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_tTykMrudEeiljfl0umr-iQ" points="[767, -36, -643984, -643984]$[767, 42, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_tZRhILudEeiljfl0umr-iQ" id="(0.6349206349206349,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_tTykMrudEeiljfl0umr-iQ" points="[895, 289, -643984, -643984]$[895, 392, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_tZRhILudEeiljfl0umr-iQ" id="(0.6485260770975056,1.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_tZRhIbudEeiljfl0umr-iQ" id="(0.7260726072607261,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_NDF3oMMqEei3gLXE4_XcoA" type="Association_Edge" source="_F5DNQpo1EeiOmuqNbykpsw" target="_SvF9cJozEeiOmuqNbykpsw">
@@ -4389,7 +4894,7 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_NDF3pcMqEei3gLXE4_XcoA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_PMo-EMMqEei3gLXE4_XcoA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NDF3psMqEei3gLXE4_XcoA" x="-2" y="-11"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NDF3psMqEei3gLXE4_XcoA" x="5" y="-11"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_NDF3p8MqEei3gLXE4_XcoA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_PO7dEMMqEei3gLXE4_XcoA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4405,7 +4910,7 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_NDF3rcMqEei3gLXE4_XcoA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_PYLfsMMqEei3gLXE4_XcoA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NDF3rsMqEei3gLXE4_XcoA" x="-7" y="13"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NDF3rsMqEei3gLXE4_XcoA" x="-19" y="15"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_NDF3ocMqEei3gLXE4_XcoA"/>
       <element href="TapiConnectivity.uml#_B3JLoEHCEeWqPKyD1j6LMg"/>
@@ -4413,185 +4918,185 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PbcPEMMqEei3gLXE4_XcoA" id="(1.0,0.5846153846153846)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PbcPEcMqEei3gLXE4_XcoA" id="(0.0,0.49230769230769234)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n2PclHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_SvF9cJozEeiOmuqNbykpsw" target="_n2PckHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n2PclXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n2PcmXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hMgItKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_SvF9cJozEeiOmuqNbykpsw" target="_hMgIsKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hMgItaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hMgIuaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n2PclnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n2Pcl3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n2PcmHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hMgItqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hMgIt6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hMgIuKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n2_qhHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_aiK4MJozEeiOmuqNbykpsw" target="_n2_qgHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n2_qhXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n2_qiXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hNOhdKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_aiK4MJozEeiOmuqNbykpsw" target="_hNOhcKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hNOhdaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNOheaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n2_qhnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n2_qh3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n2_qiHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hNOhdqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNOhd6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNOheKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n3fZxHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_c-z5wZozEeiOmuqNbykpsw" target="_n3fZwHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n3fZxXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n3fZyXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hNr0dKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_c-z5wZozEeiOmuqNbykpsw" target="_hNr0cKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hNr0daWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNsbgKWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n3fZxnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n3fZx3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n3fZyHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hNr0dqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNr0d6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNr0eKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n3k5VHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_qPcpYJozEeiOmuqNbykpsw" target="_n3k5UHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n3k5VXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n3k5WXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hNxUBKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qPcpYJozEeiOmuqNbykpsw" target="_hNxUAKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hNxUBaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNxUCaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n3k5VnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n3k5V3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n3k5WHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hNxUBqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNxUB6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNxUCKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n4MkZHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_a2-DgpozEeiOmuqNbykpsw" target="_n4MkYHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n4MkZXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4NLcXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hOUtpKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_a2-DgpozEeiOmuqNbykpsw" target="_hOUtoKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hOUtpaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOUtqaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4MkZnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4MkZ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4NLcHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hOUtpqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOUtp6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOUtqKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n4sTpHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_dbbkUJozEeiOmuqNbykpsw" target="_n4sToHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n4sTpXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4sTqXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hOzOxKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dbbkUJozEeiOmuqNbykpsw" target="_hOzOwKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hOzOxaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOzOyaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4sTpnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4sTp3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4sTqHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hOzOxqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOzOx6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOzOyKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n4xzNHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_quGUQJozEeiOmuqNbykpsw" target="_n4xzMHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n4xzNXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4xzOXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hO5VZKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_quGUQJozEeiOmuqNbykpsw" target="_hO5VYKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hO5VZaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hO5VaaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4xzNnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4xzN3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4xzOHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hO5VZqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hO5VZ6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hO5VaKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n5TXpHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_lvNYYJozEeiOmuqNbykpsw" target="_n5TXoHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n5TXpXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n5T-snpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hPfLRKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lvNYYJozEeiOmuqNbykpsw" target="_hPfLQKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hPfLRaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hPfLSaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n5TXpnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n5T-sHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n5T-sXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hPfLRqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hPfLR6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hPfLSKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n6BwYXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_avUEAJs-EeikSLSDi2qpXA" target="_n6BJUHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n6BwYnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n6BwZnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hQROYaWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_avUEAJs-EeikSLSDi2qpXA" target="_hQQnUKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hQROYqWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQROZqWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n6BwY3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6BwZHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6BwZXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hQROY6WaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQROZKWaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQROZaWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n6KTQXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_tTykMLudEeiljfl0umr-iQ" target="_n6JsMHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n6KTQnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n6KTRnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hQepxKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tTykMLudEeiljfl0umr-iQ" target="_hQepwKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hQepxaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQfQ0aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n6KTQ3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6KTRHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6KTRXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hQepxqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQepx6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQfQ0KWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n6lKBHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_F5DNQpo1EeiOmuqNbykpsw" target="_n6lKAHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n6lKBXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n6lKCXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hRGU1KWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5DNQpo1EeiOmuqNbykpsw" target="_hRGU0KWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hRGU1aWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hRGU2aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n6lKBnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6lKB3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6lKCHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hRGU1qWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hRGU16WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hRGU2KWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n7X0NHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_n7X0MHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n7X0NXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n7X0OXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hSI2pKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_hSI2oKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hSI2paWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSI2qaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n7X0NnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n7X0N3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n7X0OHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hSI2pqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSI2p6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSI2qKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n75_tHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_F5DNMJo1EeiOmuqNbykpsw" target="_n75_sHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n75_tXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n75_uXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hSy99KWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5DNMJo1EeiOmuqNbykpsw" target="_hSy98KWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hSy99aWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSy9-aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n75_tnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n75_t3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n75_uHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hSy99qWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSy996WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSy9-KWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n8B7gXpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_F5JURJo1EeiOmuqNbykpsw" target="_n8BUcHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n8B7gnpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n8B7hnpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hS65xKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5JURJo1EeiOmuqNbykpsw" target="_hS65wKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hS65xaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hS65yaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hv9NsNnYEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n8B7g3pHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n8B7hHpHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n8B7hXpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hS65xqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hS65x6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hS65yKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n8q0tHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_F5JUXpo1EeiOmuqNbykpsw" target="_n8q0sHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n8q0tXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n8q0uXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hTik1KWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5JUXpo1EeiOmuqNbykpsw" target="_hTik0KWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hTik1aWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hTik2aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n8q0tnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n8q0t3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n8q0uHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hTik1qWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hTik16WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hTik2KWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n9zdJHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_WDKY0JqMEeid4dfn4JFJZg" target="_n9zdIHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n9zdJXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n9zdKXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hUsbZKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WDKY0JqMEeid4dfn4JFJZg" target="_hUsbYKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hUsbZaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hUsbaaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n9zdJnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n9zdJ3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n9zdKHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hUsbZqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hUsbZ6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hUsbaKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n-I0UHpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_dkQywJqMEeid4dfn4JFJZg" target="_n-INQHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n-I0UXpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n-I0VXpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hVCZpKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dkQywJqMEeid4dfn4JFJZg" target="_hVCZoKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hVCZpaWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVCZqaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n-I0UnpHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n-I0U3pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n-I0VHpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hVCZpqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVCZp6WaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVCZqKWaEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n-0w0HpHEeqOCchXc-J80w" type="StereotypeCommentLink" source="_asvRIJs-EeikSLSDi2qpXA" target="_n-0JwHpHEeqOCchXc-J80w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n-0w0XpHEeqOCchXc-J80w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n-0w1XpHEeqOCchXc-J80w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_hVqrwaWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_asvRIJs-EeikSLSDi2qpXA" target="_hVqEsKWaEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hVqrwqWaEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVqrxqWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n-0w0npHEeqOCchXc-J80w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n-0w03pHEeqOCchXc-J80w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n-0w1HpHEeqOCchXc-J80w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hVqrw6WaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVqrxKWaEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVqrxaWaEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_47kdwPJSEeiTnqcAgKK24Q" type="PapyrusUMLClassDiagram" name="ServiceInterfaceSpec" measurementUnit="Pixel">
@@ -4603,7 +5108,7 @@
     <children xsi:type="notation:Shape" xmi:id="_8W-NoPJSEeiTnqcAgKK24Q" type="NamedElement_DefaultShape">
       <children xsi:type="notation:DecorationNode" xmi:id="_8W-NovJSEeiTnqcAgKK24Q" type="NamedElement_NameLabel"/>
       <element href="TapiCommon.uml#_WHPOAFJvEeWcs7ZjyujtOg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8W-NofJSEeiTnqcAgKK24Q" x="-5" y="151"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8W-NofJSEeiTnqcAgKK24Q" x="-100" y="160"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_RmCMYPJTEeiTnqcAgKK24Q" type="NamedElement_DefaultShape">
       <children xsi:type="notation:DecorationNode" xmi:id="_RmCMYvJTEeiTnqcAgKK24Q" type="NamedElement_NameLabel"/>
@@ -4649,7 +5154,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aYe5g_JTEeiTnqcAgKK24Q"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aYe5cfJTEeiTnqcAgKK24Q" x="25" y="281" width="311" height="59"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aYe5cfJTEeiTnqcAgKK24Q" x="20" y="360" width="311" height="59"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_lm3dcPJTEeiTnqcAgKK24Q" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_lm3dcvJTEeiTnqcAgKK24Q" type="Class_NameLabel"/>
@@ -4729,213 +5234,213 @@
       <element href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_byzeEfPiEeinaYo1FpF9OA" x="31" y="8" width="299" height="66"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PD40E_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PD40FPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PD40FvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DPpogKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DPpogaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DPpog6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_WHPN8FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PD40FfPlEeinaYo1FpF9OA" x="374" y="118"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DPpogqWcEeqJcvXkREZ1XQ" x="380" y="154"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PELvAPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PELvAfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PELvA_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DP3q8KWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DP3q8aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DP3q86WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_WHPOAFJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PELvAvPlEeinaYo1FpF9OA" x="189" y="115"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DP3q8qWcEeqJcvXkREZ1XQ" x="195" y="151"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PE8kAPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PE8kAfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PE8kA_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DQDRIKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DQDRIaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQDRI6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_WHPN81JvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PE8kAvPlEeinaYo1FpF9OA" x="1173" y="-32"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DQDRIqWcEeqJcvXkREZ1XQ" x="1173" y="-32"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PFO34_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PFO35PPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PFO35vPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DQPeYKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DQPeYaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQPeY6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_WHPN6FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PFO35fPlEeinaYo1FpF9OA" x="683" y="-21"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DQPeYqWcEeqJcvXkREZ1XQ" x="683" y="-21"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PFnSYPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PFnSYfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PFnSY_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DQhLMKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DQhLMaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQhLM6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_AnTcAKU5EeWkWNPM1BHzGA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PFnSYvPlEeinaYo1FpF9OA" x="662" y="391"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DQhLMqWcEeqJcvXkREZ1XQ" x="662" y="391"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PF_s4PPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PF_s4fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PF_s4_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DQyQ8KWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DQyQ8aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQyQ86WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_qH8fkL2NEeWdore3Cxez9g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PF_s4vPlEeinaYo1FpF9OA" x="1166" y="389"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DQyQ8qWcEeqJcvXkREZ1XQ" x="1166" y="389"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PGwh4PPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PGwh4fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PGwh4_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DRbKIKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DRbKIaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DRbxMKWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PGwh4vPlEeinaYo1FpF9OA" x="219" y="245"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DRbKIqWcEeqJcvXkREZ1XQ" x="225" y="281"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PHC1w_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PHC1xPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PHC1xvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DRyWgKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DRyWgaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DRyWg6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_z05pcPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PHC1xfPlEeinaYo1FpF9OA" x="219" y="145"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DRyWgqWcEeqJcvXkREZ1XQ" x="225" y="181"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PHI8afPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PHI8avPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PHI8bPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DR32EKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DR32EaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DR4dIKWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_0gaEkPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PHI8a_PlEeinaYo1FpF9OA" x="219" y="145"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DR32EqWcEeqJcvXkREZ1XQ" x="225" y="181"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PIYSg_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PIYShPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PIYShvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DSp5MKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DSp5MaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DSqgQKWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PIYShfPlEeinaYo1FpF9OA" x="668" y="135"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DSp5MqWcEeqJcvXkREZ1XQ" x="668" y="135"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PKADIPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PKADIfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKADI_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DTHMMKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DTHMMaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTHMM6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2olSAPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PKADIvPlEeinaYo1FpF9OA" x="668" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DTHMMqWcEeqJcvXkREZ1XQ" x="668" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PKAqM_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PKAqNPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKAqNvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DTMEsKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DTMEsaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTMEs6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_3PqgIPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PKAqNfPlEeinaYo1FpF9OA" x="668" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DTMEsqWcEeqJcvXkREZ1XQ" x="668" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PKH-8PPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PKH-8fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKH-8_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DTRkQKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DTRkQaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTRkQ6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8ryxoPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PKH-8vPlEeinaYo1FpF9OA" x="668" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DTRkQqWcEeqJcvXkREZ1XQ" x="668" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PKZEsPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PKZEsfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKZEs_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DTV1sKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DTV1saWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTWcwKWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-HZ0APJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PKZEsvPlEeinaYo1FpF9OA" x="668" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DTV1sqWcEeqJcvXkREZ1XQ" x="668" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PKfLU_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PKfLVPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKfLVvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DTbVQKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DTbVQaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTbVQ6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_OuQmoPJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PKfLVfPlEeinaYo1FpF9OA" x="668" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DTbVQqWcEeqJcvXkREZ1XQ" x="668" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PKl5APPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PKl5AfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKl5A_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DTgNwKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DTgNwaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTgNw6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Qv8xkPJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PKl5AvPlEeinaYo1FpF9OA" x="668" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DTgNwqWcEeqJcvXkREZ1XQ" x="668" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PLcNkPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PLcNkfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PLcNk_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DUIf4KWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DUIf4aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUIf46WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PLcNkvPlEeinaYo1FpF9OA" x="1157" y="135"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DUIf4qWcEeqJcvXkREZ1XQ" x="1157" y="135"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PMHjAPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PMHjAfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMHjA_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DUlL0KWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DUlL0aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUly4KWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_32fPkPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PMHjAvPlEeinaYo1FpF9OA" x="1157" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DUlL0qWcEeqJcvXkREZ1XQ" x="1157" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PMNpo_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PMNppPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMTwQPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DUqEUKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DUqEUaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUqEU6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4V4hUPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PMNppfPlEeinaYo1FpF9OA" x="1157" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DUqEUqWcEeqJcvXkREZ1XQ" x="1157" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PMZ24PPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PMZ24fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMZ24_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DUuVwKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DUu80KWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUu80qWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_5DM6UPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PMZ24vPlEeinaYo1FpF9OA" x="1157" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DUu80aWcEeqJcvXkREZ1XQ" x="1157" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PMf9gPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PMf9gfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMf9g_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DUz1UKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DUz1UaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUz1U6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_56YZ8PJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PMf9gvPlEeinaYo1FpF9OA" x="1157" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DUz1UqWcEeqJcvXkREZ1XQ" x="1157" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PMmEI_PlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PMmEJPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMmEJvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DU6jAKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DU6jAaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DU6jA6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GZ48sPJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PMmEJfPlEeinaYo1FpF9OA" x="1157" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DU6jAqWcEeqJcvXkREZ1XQ" x="1157" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PM4YAPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PM4YAfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PM4YA_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DU_bgKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DU_bgaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DU_bg6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_P7X6APJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PM4YAvPlEeinaYo1FpF9OA" x="1157" y="35"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DU_bgqWcEeqJcvXkREZ1XQ" x="1157" y="35"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_PNjtcPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_PNjtcfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PNjtc_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DVcugKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DVcugaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DVcug6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_PNjtcvPlEeinaYo1FpF9OA" x="225" y="-28"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DVcugqWcEeqJcvXkREZ1XQ" x="231" y="8"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_POCOkPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_POCOkfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_POCOk_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DVwQgKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DVwQgaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DVwQg6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_gfAHcPPiEeinaYo1FpF9OA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_POCOkvPlEeinaYo1FpF9OA" x="225" y="-128"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DVwQgqWcEeqJcvXkREZ1XQ" x="231" y="-92"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_POIVMPPlEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_POIVMfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_POIVM_PlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_DV2XIKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DV2XIaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DV2XI6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hQjgMPPiEeinaYo1FpF9OA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_POIVMvPlEeinaYo1FpF9OA" x="225" y="-128"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DV2XIqWcEeqJcvXkREZ1XQ" x="231" y="-92"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_47kdwfJSEeiTnqcAgKK24Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_47kdwvJSEeiTnqcAgKK24Q"/>
@@ -4946,41 +5451,41 @@
     <edges xsi:type="notation:Connector" xmi:id="_z0_wEPJTEeiTnqcAgKK24Q" type="Abstraction_Edge" source="_aYe5cPJTEeiTnqcAgKK24Q" target="_8W-NoPJSEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_z0_wE_JTEeiTnqcAgKK24Q" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_egLSIPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1F2sPJTEeiTnqcAgKK24Q" x="8" y="8"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1F2sPJTEeiTnqcAgKK24Q" x="-52" y="-3"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_z1F2sfJTEeiTnqcAgKK24Q" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eg8HIPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1F2svJTEeiTnqcAgKK24Q" x="-11" y="1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z1F2svJTEeiTnqcAgKK24Q" x="-72" y="6"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_z0_wEfJTEeiTnqcAgKK24Q"/>
       <element href="TapiPhotonicMedia.uml#_z05pcPJTEeiTnqcAgKK24Q"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z0_wEvJTEeiTnqcAgKK24Q" points="[82, 293, -643984, -643984]$[82, 194, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z2ngsPJTEeiTnqcAgKK24Q" id="(0.1832797427652733,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z2ngsfJTEeiTnqcAgKK24Q" id="(0.4887640449438202,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z0_wEvJTEeiTnqcAgKK24Q" points="[80, 281, -643984, -643984]$[80, 240, -643984, -643984]$[120, 240, -643984, -643984]$[120, 201, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z2ngsPJTEeiTnqcAgKK24Q" id="(0.19292604501607716,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z2ngsfJTEeiTnqcAgKK24Q" id="(0.48582995951417,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_0ggLMPJTEeiTnqcAgKK24Q" type="Abstraction_Edge" source="_aYe5cPJTEeiTnqcAgKK24Q" target="_76u9kPJSEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_0ggLM_JTEeiTnqcAgKK24Q" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ujPtIPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0ggLNPJTEeiTnqcAgKK24Q" x="8" y="11"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0ggLNPJTEeiTnqcAgKK24Q" x="30" y="-9"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_0ggLNfJTEeiTnqcAgKK24Q" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ukY8oPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0ggLNvJTEeiTnqcAgKK24Q" x="-9" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0ggLNvJTEeiTnqcAgKK24Q" x="10" y="-14"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_0ggLMfJTEeiTnqcAgKK24Q"/>
       <element href="TapiPhotonicMedia.uml#_0gaEkPJTEeiTnqcAgKK24Q"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_0ggLMvJTEeiTnqcAgKK24Q" points="[287, 293, -643984, -643984]$[287, 197, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0iUJEPJTEeiTnqcAgKK24Q" id="(0.842443729903537,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0iUJEfJTEeiTnqcAgKK24Q" id="(0.5487179487179488,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_0ggLMvJTEeiTnqcAgKK24Q" points="[280, 281, -643984, -643984]$[280, 240, -643984, -643984]$[320, 240, -643984, -643984]$[320, 204, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0iUJEPJTEeiTnqcAgKK24Q" id="(0.8360128617363344,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0iUJEfJTEeiTnqcAgKK24Q" id="(0.5128205128205128,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_2olSAfJTEeiTnqcAgKK24Q" type="Abstraction_Edge" source="_lm3dcPJTEeiTnqcAgKK24Q" target="_R6EisPJTEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_2olSBPJTEeiTnqcAgKK24Q" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_GC6SAPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2olSBfJTEeiTnqcAgKK24Q" x="-1" y="38"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2olSBfJTEeiTnqcAgKK24Q" x="30" y="21"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_2olSBvJTEeiTnqcAgKK24Q" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_GDrHAPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_2olSB_JTEeiTnqcAgKK24Q" x="-18" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_2olSB_JTEeiTnqcAgKK24Q" x="10" y="6"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_2olSAvJTEeiTnqcAgKK24Q"/>
       <element href="TapiPhotonicMedia.uml#_2olSAPJTEeiTnqcAgKK24Q"/>
@@ -5029,18 +5534,18 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_4V-n8fJTEeiTnqcAgKK24Q"/>
       <element href="TapiPhotonicMedia.uml#_4V4hUPJTEeiTnqcAgKK24Q"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4V-n8vJTEeiTnqcAgKK24Q" points="[1196, 220, -643984, -643984]$[1196, 389, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4XaLUPJTEeiTnqcAgKK24Q" id="(0.8350877192982457,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4XaLUfJTEeiTnqcAgKK24Q" id="(0.8388278388278388,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4V-n8vJTEeiTnqcAgKK24Q" points="[1300, 220, -643984, -643984]$[1300, 440, -643984, -643984]$[1239, 440, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4XaLUPJTEeiTnqcAgKK24Q" id="(0.849009900990099,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4XaLUfJTEeiTnqcAgKK24Q" id="(1.0,0.5666666666666667)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_5DM6UfJTEeiTnqcAgKK24Q" type="Abstraction_Edge" source="_tNB9kPJTEeiTnqcAgKK24Q" target="_RmCMYPJTEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_5DM6VPJTEeiTnqcAgKK24Q" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FufhMPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_5DM6VfJTEeiTnqcAgKK24Q" x="1" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5DM6VfJTEeiTnqcAgKK24Q" x="-64" y="27"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_5DM6VvJTEeiTnqcAgKK24Q" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FvKPkPJUEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_5DM6V_JTEeiTnqcAgKK24Q" x="-17" y="4"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5DM6V_JTEeiTnqcAgKK24Q" x="-39" y="-13"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_5DM6UvJTEeiTnqcAgKK24Q"/>
       <element href="TapiPhotonicMedia.uml#_5DM6UPJTEeiTnqcAgKK24Q"/>
@@ -5096,17 +5601,17 @@
     <edges xsi:type="notation:Connector" xmi:id="_GZ_DUPJWEeiTnqcAgKK24Q" type="Abstraction_Edge" source="_tNB9kPJTEeiTnqcAgKK24Q" target="_UOifsPJTEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_GZ_DU_JWEeiTnqcAgKK24Q" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WNaf0PJWEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_GZ_DVPJWEeiTnqcAgKK24Q" x="-71" y="2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_GZ_DVPJWEeiTnqcAgKK24Q" x="-13" y="-52"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_GZ_DVfJWEeiTnqcAgKK24Q" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WOjvUPJWEeiTnqcAgKK24Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_GZ_DVvJWEeiTnqcAgKK24Q" x="-54" y="-1"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_GZ_DVvJWEeiTnqcAgKK24Q" x="7" y="-46"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_GZ_DUfJWEeiTnqcAgKK24Q"/>
       <element href="TapiPhotonicMedia.uml#_GZ48sPJWEeiTnqcAgKK24Q"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_GZ_DUvJWEeiTnqcAgKK24Q" points="[1077, 220, -643984, -643984]$[1077, 389, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Gb5H0PJWEeiTnqcAgKK24Q" id="(0.42105263157894735,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Gb5H0fJWEeiTnqcAgKK24Q" id="(0.4065934065934066,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_GZ_DUvJWEeiTnqcAgKK24Q" points="[1120, 220, -643984, -643984]$[1120, 389, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Gb5H0PJWEeiTnqcAgKK24Q" id="(0.4034653465346535,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Gb5H0fJWEeiTnqcAgKK24Q" id="(0.5641025641025641,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_OuQmofJWEeiTnqcAgKK24Q" type="Abstraction_Edge" source="_lm3dcPJTEeiTnqcAgKK24Q" target="_TEZn0PJTEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_OuWtQPJWEeiTnqcAgKK24Q" type="Abstraction_NameLabel">
@@ -5156,26 +5661,26 @@
     <edges xsi:type="notation:Connector" xmi:id="_gfM7wPPiEeinaYo1FpF9OA" type="Abstraction_Edge" source="_byzeEPPiEeinaYo1FpF9OA" target="_8W-NoPJSEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_gfM7w_PiEeinaYo1FpF9OA" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lovBYPPiEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_gfNi0PPiEeinaYo1FpF9OA" x="-15" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_gfNi0PPiEeinaYo1FpF9OA" x="59" y="27"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_gfNi0fPiEeinaYo1FpF9OA" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lqVj4PPiEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_gfNi0vPiEeinaYo1FpF9OA" x="2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_gfNi0vPiEeinaYo1FpF9OA" x="66" y="-13"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_gfM7wfPiEeinaYo1FpF9OA"/>
       <element href="TapiPhotonicMedia.uml#_gfAHcPPiEeinaYo1FpF9OA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_gfM7wvPiEeinaYo1FpF9OA" points="[93, 74, -643984, -643984]$[93, 144, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_giwmEPPiEeinaYo1FpF9OA" id="(0.20735785953177258,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_giwmEfPiEeinaYo1FpF9OA" id="(0.550561797752809,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_gfM7wvPiEeinaYo1FpF9OA" points="[100, 74, -643984, -643984]$[100, 119, -643984, -643984]$[140, 119, -643984, -643984]$[140, 151, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_giwmEPPiEeinaYo1FpF9OA" id="(0.23076923076923078,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_giwmEfPiEeinaYo1FpF9OA" id="(0.5668016194331984,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_hQmjgPPiEeinaYo1FpF9OA" type="Abstraction_Edge" source="_byzeEPPiEeinaYo1FpF9OA" target="_76u9kPJSEeiTnqcAgKK24Q" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_hQnKkPPiEeinaYo1FpF9OA" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lsb1oPPiEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hQnKkfPiEeinaYo1FpF9OA" x="-17" y="-13"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hQnKkfPiEeinaYo1FpF9OA" x="8" y="-23"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_hQnKkvPiEeinaYo1FpF9OA" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lutGgPPiEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hQnKk_PiEeinaYo1FpF9OA" x="6" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hQnKk_PiEeinaYo1FpF9OA" x="27" y="-3"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_hQmjgfPiEeinaYo1FpF9OA"/>
       <element href="TapiPhotonicMedia.uml#_hQjgMPPiEeinaYo1FpF9OA"/>
@@ -5183,265 +5688,265 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hUMqEPPiEeinaYo1FpF9OA" id="(0.842809364548495,1.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hUMqEfPiEeinaYo1FpF9OA" id="(0.5282051282051282,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PD40F_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_76u9kPJSEeiTnqcAgKK24Q" target="_PD40E_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PD40GPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PD40HPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DPpohKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_76u9kPJSEeiTnqcAgKK24Q" target="_DPpogKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DPpohaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DPpoiaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_WHPN8FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PD40GfPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PD40GvPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PD40G_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DPpohqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DPpoh6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DPpoiKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PELvBPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_8W-NoPJSEeiTnqcAgKK24Q" target="_PELvAPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PELvBfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PELvCfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DP3q9KWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8W-NoPJSEeiTnqcAgKK24Q" target="_DP3q8KWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DP3q9aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DP4SAaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_WHPOAFJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PELvBvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PELvB_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PELvCPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DP3q9qWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DP3q96WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DP4SAKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PE8kBPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_RmCMYPJTEeiTnqcAgKK24Q" target="_PE8kAPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PE8kBfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PE8kCfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DQDRJKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_RmCMYPJTEeiTnqcAgKK24Q" target="_DQDRIKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DQDRJaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQDRKaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_WHPN81JvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PE8kBvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PE8kB_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PE8kCPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DQDRJqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQDRJ6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQDRKKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PFO35_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_R6EisPJTEeiTnqcAgKK24Q" target="_PFO34_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PFO36PPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PFO37PPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DQPeZKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_R6EisPJTEeiTnqcAgKK24Q" target="_DQPeYKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DQPeZaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQPeaaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_WHPN6FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PFO36fPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PFO36vPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PFO36_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DQPeZqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQPeZ6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQPeaKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PFnSZPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_TEZn0PJTEeiTnqcAgKK24Q" target="_PFnSYPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PFnSZfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PFnSafPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DQhLNKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_TEZn0PJTEeiTnqcAgKK24Q" target="_DQhLMKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DQhLNaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQhLOaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_AnTcAKU5EeWkWNPM1BHzGA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PFnSZvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PFnSZ_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PFnSaPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DQhLNqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQhLN6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQhLOKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PF_s5PPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_UOifsPJTEeiTnqcAgKK24Q" target="_PF_s4PPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PF_s5fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PF_s6fPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DQyQ9KWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UOifsPJTEeiTnqcAgKK24Q" target="_DQyQ8KWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DQyQ9aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DQy4AqWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_qH8fkL2NEeWdore3Cxez9g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PF_s5vPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PF_s5_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PF_s6PPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DQyQ9qWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQy4AKWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DQy4AaWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PGwh5PPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_aYe5cPJTEeiTnqcAgKK24Q" target="_PGwh4PPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PGwh5fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PGwh6fPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DRbxMaWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_aYe5cPJTEeiTnqcAgKK24Q" target="_DRbKIKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DRbxMqWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DRbxNqWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PGwh5vPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PGwh5_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PGwh6PPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DRbxM6WcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DRbxNKWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DRbxNaWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PHC1x_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_z0_wEPJTEeiTnqcAgKK24Q" target="_PHC1w_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PHC1yPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PHC1zPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DRyWhKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_z0_wEPJTEeiTnqcAgKK24Q" target="_DRyWgKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DRyWhaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DRyWiaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_z05pcPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PHC1yfPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PHC1yvPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PHC1y_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DRyWhqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DRyWh6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DRyWiKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PHI8bfPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_0ggLMPJTEeiTnqcAgKK24Q" target="_PHI8afPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PHI8bvPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PHI8cvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DR4dIaWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0ggLMPJTEeiTnqcAgKK24Q" target="_DR32EKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DR4dIqWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DR4dJqWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_0gaEkPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PHI8b_PlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PHI8cPPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PHI8cfPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DR4dI6WcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DR4dJKWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DR4dJaWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PIYSh_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_lm3dcPJTEeiTnqcAgKK24Q" target="_PIYSg_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PIYSiPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PIYSjPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DSqgQaWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lm3dcPJTEeiTnqcAgKK24Q" target="_DSp5MKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DSqgQqWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DSqgRqWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PIYSifPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PIYSivPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PIYSi_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DSqgQ6WcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DSqgRKWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DSqgRaWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PKADJPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_2olSAfJTEeiTnqcAgKK24Q" target="_PKADIPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PKADJfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKADKfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DTHMNKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_2olSAfJTEeiTnqcAgKK24Q" target="_DTHMMKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DTHMNaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTHMOaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2olSAPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PKADJvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKADJ_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKADKPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DTHMNqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTHMN6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTHMOKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PKAqN_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_3PqgIfJTEeiTnqcAgKK24Q" target="_PKAqM_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PKAqOPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKAqPPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DTMrwKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3PqgIfJTEeiTnqcAgKK24Q" target="_DTMEsKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DTMrwaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTMrxaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_3PqgIPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PKAqOfPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKAqOvPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKAqO_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DTMrwqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTMrw6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTMrxKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PKH-9PPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_8ryxofJTEeiTnqcAgKK24Q" target="_PKH-8PPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PKH-9fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKH--fPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DTRkRKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8ryxofJTEeiTnqcAgKK24Q" target="_DTRkQKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DTRkRaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTRkSaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8ryxoPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PKH-9vPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKH-9_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKH--PPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DTRkRqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTRkR6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTRkSKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PKZEtPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_-HZ0AfJTEeiTnqcAgKK24Q" target="_PKZEsPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PKZEtfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKZEufPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DTWcwaWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-HZ0AfJTEeiTnqcAgKK24Q" target="_DTV1sKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DTWcwqWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTWcxqWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-HZ0APJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PKZEtvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKZEt_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKZEuPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DTWcw6WcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTWcxKWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTWcxaWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PKfLV_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_OuQmofJWEeiTnqcAgKK24Q" target="_PKfLU_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PKfLWPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKfLXPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DTbVRKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_OuQmofJWEeiTnqcAgKK24Q" target="_DTbVQKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DTbVRaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTbVSaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_OuQmoPJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PKfLWfPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKfLWvPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKfLW_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DTbVRqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTbVR6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTbVSKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PKl5BPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_Qv8xkfJWEeiTnqcAgKK24Q" target="_PKl5APPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PKl5BfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PKl5CfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DTgNxKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Qv8xkfJWEeiTnqcAgKK24Q" target="_DTgNwKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DTgNxaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DTgNyaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Qv8xkPJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PKl5BvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKl5B_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PKl5CPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DTgNxqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTgNx6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DTgNyKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PLcNlPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_tNB9kPJTEeiTnqcAgKK24Q" target="_PLcNkPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PLcNlfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PLcNmfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DUIf5KWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tNB9kPJTEeiTnqcAgKK24Q" target="_DUIf4KWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DUIf5aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUIf6aWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PLcNlvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PLcNl_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PLcNmPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DUIf5qWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUIf56WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUIf6KWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PMHjBPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_32fPkfJTEeiTnqcAgKK24Q" target="_PMHjAPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PMHjBfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMHjCfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DUly4aWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_32fPkfJTEeiTnqcAgKK24Q" target="_DUlL0KWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DUly4qWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUly5qWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_32fPkPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PMHjBvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMHjB_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMHjCPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DUly46WcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUly5KWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUly5aWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PMTwQfPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_4V-n8PJTEeiTnqcAgKK24Q" target="_PMNpo_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PMTwQvPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMTwRvPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DUqEVKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4V-n8PJTEeiTnqcAgKK24Q" target="_DUqEUKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DUqEVaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUqEWaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4V4hUPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PMTwQ_PlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMTwRPPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMTwRfPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DUqEVqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUqEV6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUqEWKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PMZ25PPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_5DM6UfJTEeiTnqcAgKK24Q" target="_PMZ24PPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PMZ25fPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMZ26fPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DUu806WcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_5DM6UfJTEeiTnqcAgKK24Q" target="_DUuVwKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DUu81KWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUu82KWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_5DM6UPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PMZ25vPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMZ25_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMZ26PPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DUu81aWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUu81qWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUu816WcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PMf9hPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_56YZ8fJTEeiTnqcAgKK24Q" target="_PMf9gPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PMf9hfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMf9ifPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DUz1VKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_56YZ8fJTEeiTnqcAgKK24Q" target="_DUz1UKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DUz1VaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DUz1WaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_56YZ8PJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PMf9hvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMf9h_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMf9iPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DUz1VqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUz1V6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DUz1WKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PMmEJ_PlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_GZ_DUPJWEeiTnqcAgKK24Q" target="_PMmEI_PlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PMmEKPPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PMmELPPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DU6jBKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GZ_DUPJWEeiTnqcAgKK24Q" target="_DU6jAKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DU6jBaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DU6jCaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GZ48sPJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PMmEKfPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMmEKvPlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PMmEK_PlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DU6jBqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DU6jB6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DU6jCKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PM4YBPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_P7X6AfJWEeiTnqcAgKK24Q" target="_PM4YAPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PM4YBfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PM4YCfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DU_bhKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_P7X6AfJWEeiTnqcAgKK24Q" target="_DU_bgKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DU_bhaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DU_biaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_P7X6APJWEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PM4YBvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PM4YB_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PM4YCPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DU_bhqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DU_bh6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DU_biKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_PNjtdPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_byzeEPPiEeinaYo1FpF9OA" target="_PNjtcPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_PNjtdfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_PNjtefPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DVcuhKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_byzeEPPiEeinaYo1FpF9OA" target="_DVcugKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DVcuhaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DVdVkqWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PNjtdvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PNjtd_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PNjtePPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DVcuhqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DVdVkKWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DVdVkaWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_POCOlPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_gfM7wPPiEeinaYo1FpF9OA" target="_POCOkPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_POCOlfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_POCOmfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DVw3kKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_gfM7wPPiEeinaYo1FpF9OA" target="_DVwQgKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DVw3kaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DVw3laWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_gfAHcPPiEeinaYo1FpF9OA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_POCOlvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_POCOl_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_POCOmPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DVw3kqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DVw3k6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DVw3lKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_POIVNPPlEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_hQmjgPPiEeinaYo1FpF9OA" target="_POIVMPPlEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_POIVNfPlEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_POIVOfPlEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_DV2XJKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_hQmjgPPiEeinaYo1FpF9OA" target="_DV2XIKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_DV2XJaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DV2XKaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hQjgMPPiEeinaYo1FpF9OA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_POIVNvPlEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_POIVN_PlEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_POIVOPPlEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DV2XJqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DV2XJ6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DV2XKKWcEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_1hK84PPmEeinaYo1FpF9OA" type="PapyrusUMLClassDiagram" name="ResourceInterfaceSpec" measurementUnit="Pixel">
@@ -5476,43 +5981,11 @@
       <element href="TapiTopology.uml#_dACyYPMwEeSb-q8_djA2ng"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_82BrB_PmEeinaYo1FpF9OA" x="40" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_824mMPPmEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_824mMfPmEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_824mM_PmEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_824mMvPmEeinaYo1FpF9OA" x="285" y="446"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_82-s0PPmEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_82-s0fPmEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_82-s0_PmEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_0_aUwPJTEeiTnqcAgKK24Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_82-s0vPmEeinaYo1FpF9OA" x="285" y="346"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_83K6EPPmEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_83K6EfPmEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_83K6E_PmEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_dACyYPMwEeSb-q8_djA2ng"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_83K6EvPmEeinaYo1FpF9OA" x="303" y="327"/>
-    </children>
     <children xsi:type="notation:Shape" xmi:id="_ccsWUPPnEeinaYo1FpF9OA" type="NamedElement_DefaultShape">
       <children xsi:type="notation:DecorationNode" xmi:id="_ccsWUvPnEeinaYo1FpF9OA" type="NamedElement_NameLabel"/>
       <element href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ccsWUfPnEeinaYo1FpF9OA" x="402" y="142" width="371" height="70"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_cc4jk_PnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_cc4jlPPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cc4jlvPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cc4jlfPnEeinaYo1FpF9OA" x="200"/>
-    </children>
     <children xsi:type="notation:Shape" xmi:id="_fxd5wPPnEeinaYo1FpF9OA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_fxd5wvPnEeinaYo1FpF9OA" type="Class_NameLabel"/>
       <children xsi:type="notation:DecorationNode" xmi:id="_fxd5w_PnEeinaYo1FpF9OA" type="Class_FloatingNameLabel">
@@ -5539,14 +6012,6 @@
       <element href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fxd5wfPnEeinaYo1FpF9OA" x="416" y="-2" width="325" height="74"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_fxwNoPPnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_fxwNofPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fxwNo_PnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fxwNovPnEeinaYo1FpF9OA" x="200"/>
-    </children>
     <children xsi:type="notation:Shape" xmi:id="_qeHpsPPnEeinaYo1FpF9OA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_qeHpsvPnEeinaYo1FpF9OA" type="Class_NameLabel"/>
       <children xsi:type="notation:DecorationNode" xmi:id="_qeHps_PnEeinaYo1FpF9OA" type="Class_FloatingNameLabel">
@@ -5573,14 +6038,6 @@
       <element href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_qeHpsfPnEeinaYo1FpF9OA" x="305" y="299" width="272" height="68"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_qeT28_PnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_qeT29PPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_qeT29vPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_qeT29fPnEeinaYo1FpF9OA" x="200"/>
-    </children>
     <children xsi:type="notation:Shape" xmi:id="_s45qEPPnEeinaYo1FpF9OA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_s45qEvPnEeinaYo1FpF9OA" type="Class_NameLabel"/>
       <children xsi:type="notation:DecorationNode" xmi:id="_s45qE_PnEeinaYo1FpF9OA" type="Class_FloatingNameLabel">
@@ -5607,37 +6064,85 @@
       <element href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s45qEfPnEeinaYo1FpF9OA" x="590" y="298" width="253" height="70"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_s5L98_PnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_s5L99PPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5L99vPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
+    <children xsi:type="notation:Shape" xmi:id="_EJn9cKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EJn9caWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EJn9c6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s5L99fPnEeinaYo1FpF9OA" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EJn9cqWcEeqJcvXkREZ1XQ" x="222" y="153"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_6gm14_PnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_6gm15PPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6gm15vPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_z7sXYPPnEeinaYo1FpF9OA"/>
+    <children xsi:type="notation:Shape" xmi:id="_EJ-iwKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EJ-iwaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EJ-iw6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_0_aUwPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6gm15fPnEeinaYo1FpF9OA" x="790" y="198"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EJ-iwqWcEeqJcvXkREZ1XQ" x="222" y="53"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7jeoI_PnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7jeoJPPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7jeoJvPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_zUAsUPPnEeinaYo1FpF9OA"/>
+    <children xsi:type="notation:Shape" xmi:id="_EKI60KWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EKI60aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EKI606WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_dACyYPMwEeSb-q8_djA2ng"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EKI60qWcEeqJcvXkREZ1XQ" x="240" y="34"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_EKW9QKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EKW9QaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EKW9Q6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EKW9QqWcEeqJcvXkREZ1XQ" x="602" y="142"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_EK3TkKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EK3TkaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EK3Tk6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7jeoJfPnEeinaYo1FpF9OA" x="505" y="199"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EK3TkqWcEeqJcvXkREZ1XQ" x="616" y="-2"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_81VRk_PnEeinaYo1FpF9OA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_81VRlPPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_81bYMPPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ELLcoKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ELLcoaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ELLco6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_yw4xIPPnEeinaYo1FpF9OA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_81VRlfPnEeinaYo1FpF9OA" x="616" y="-102"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ELLcoqWcEeqJcvXkREZ1XQ" x="616" y="-102"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ELrL4KWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ELrL4aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ELrL46WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ELrL4qWcEeqJcvXkREZ1XQ" x="505" y="299"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_EL9fwKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EL9fwaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EL9fw6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_zUAsUPPnEeinaYo1FpF9OA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EL9fwqWcEeqJcvXkREZ1XQ" x="505" y="199"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_EMgSUKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EMgSUaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EMgSU6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EMgSUqWcEeqJcvXkREZ1XQ" x="790" y="298"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_EMz0UKWcEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_EMz0UaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EMz0U6WcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_z7sXYPPnEeinaYo1FpF9OA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EMz0UqWcEeqJcvXkREZ1XQ" x="790" y="198"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_1hK84fPmEeinaYo1FpF9OA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_1hK84vPmEeinaYo1FpF9OA"/>
@@ -5660,76 +6165,6 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_82BqnfPmEeinaYo1FpF9OA" id="(0.5277777777777778,0.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_82BqnvPmEeinaYo1FpF9OA" id="(0.5748502994011976,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_824mNPPmEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_82Bqn_PmEeinaYo1FpF9OA" target="_824mMPPmEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_824mNfPmEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_824mOfPmEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_824mNvPmEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_824mN_PmEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_824mOPPmEeinaYo1FpF9OA"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_82-s1PPmEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_82BqkfPmEeinaYo1FpF9OA" target="_82-s0PPmEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_82-s1fPmEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_82-s2fPmEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_0_aUwPJTEeiTnqcAgKK24Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_82-s1vPmEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_82-s1_PmEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_82-s2PPmEeinaYo1FpF9OA"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_83K6FPPmEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_82Bq5_PmEeinaYo1FpF9OA" target="_83K6EPPmEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_83K6FfPmEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_83K6GfPmEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_dACyYPMwEeSb-q8_djA2ng"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_83K6FvPmEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_83K6F_PmEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_83K6GPPmEeinaYo1FpF9OA"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_cc4jl_PnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_ccsWUPPnEeinaYo1FpF9OA" target="_cc4jk_PnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_cc4jmPPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cc4jnPPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cc4jmfPnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cc4jmvPnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cc4jm_PnEeinaYo1FpF9OA"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_fxwNpPPnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_fxd5wPPnEeinaYo1FpF9OA" target="_fxwNoPPnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_fxwNpfPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fxwNqfPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_fxwNpvPnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_fxwNp_PnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_fxwNqPPnEeinaYo1FpF9OA"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_qeT29_PnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_qeHpsPPnEeinaYo1FpF9OA" target="_qeT28_PnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_qeT2-PPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_qeT2_PPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qeT2-fPnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qeT2-vPnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_qeT2-_PnEeinaYo1FpF9OA"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_s5L99_PnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_s45qEPPnEeinaYo1FpF9OA" target="_s5L98_PnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_s5L9-PPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5L9_PPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s5L9-fPnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5L9-vPnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5L9-_PnEeinaYo1FpF9OA"/>
-    </edges>
     <edges xsi:type="notation:Connector" xmi:id="_yw4xIfPnEeinaYo1FpF9OA" type="Abstraction_Edge" source="_fxd5wPPnEeinaYo1FpF9OA" target="_ccsWUPPnEeinaYo1FpF9OA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_yw4xJPPnEeinaYo1FpF9OA" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_CrTmcPPoEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5763,11 +6198,11 @@
     <edges xsi:type="notation:Connector" xmi:id="_z7yeAPPnEeinaYo1FpF9OA" type="Abstraction_Edge" source="_s45qEPPnEeinaYo1FpF9OA" target="_ccsWUPPnEeinaYo1FpF9OA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_z7yeA_PnEeinaYo1FpF9OA" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0vUMsPPnEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z7yeBPPnEeinaYo1FpF9OA" x="4" y="3"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z7yeBPPnEeinaYo1FpF9OA" x="23" y="62"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_z7yeBfPnEeinaYo1FpF9OA" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0wLIUPPnEeinaYo1FpF9OA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z7yeBvPnEeinaYo1FpF9OA" x="-18" y="2"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z7yeBvPnEeinaYo1FpF9OA" x="3" y="26"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_z7yeAfPnEeinaYo1FpF9OA"/>
       <element href="TapiPhotonicMedia.uml#_z7sXYPPnEeinaYo1FpF9OA"/>
@@ -5775,35 +6210,105 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z82N8PPnEeinaYo1FpF9OA" id="(0.4189723320158103,0.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z82N8fPnEeinaYo1FpF9OA" id="(0.7924528301886793,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_6gm15_PnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_z7yeAPPnEeinaYo1FpF9OA" target="_6gm14_PnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_6gm16PPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6gm17PPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_z7sXYPPnEeinaYo1FpF9OA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_EJokgKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_82Bqn_PmEeinaYo1FpF9OA" target="_EJn9cKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EJokgaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EJokhaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_6gm16fPnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6gm16vPnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6gm16_PnEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EJokgqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EJokg6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EJokhKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7jeoJ_PnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_zUAsUfPnEeinaYo1FpF9OA" target="_7jeoI_PnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7jeoKPPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7jeoLPPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_zUAsUPPnEeinaYo1FpF9OA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_EJ-ixKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_82BqkfPmEeinaYo1FpF9OA" target="_EJ-iwKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EJ-ixaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EJ-iyaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_0_aUwPJTEeiTnqcAgKK24Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7jeoKfPnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7jeoKvPnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7jeoK_PnEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EJ-ixqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EJ-ix6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EJ-iyKWcEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_81bYMfPnEeinaYo1FpF9OA" type="StereotypeCommentLink" source="_yw4xIfPnEeinaYo1FpF9OA" target="_81VRk_PnEeinaYo1FpF9OA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_81bYMvPnEeinaYo1FpF9OA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_81bYNvPnEeinaYo1FpF9OA" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_EKI61KWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_82Bq5_PmEeinaYo1FpF9OA" target="_EKI60KWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EKI61aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EKI62aWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_dACyYPMwEeSb-q8_djA2ng"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EKI61qWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EKI616WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EKI62KWcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EKW9RKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ccsWUPPnEeinaYo1FpF9OA" target="_EKW9QKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EKW9RaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EKW9SaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EKW9RqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EKW9R6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EKW9SKWcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EK3TlKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_fxd5wPPnEeinaYo1FpF9OA" target="_EK3TkKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EK3TlaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EK3TmaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EK3TlqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EK3Tl6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EK3TmKWcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_ELLcpKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_yw4xIfPnEeinaYo1FpF9OA" target="_ELLcoKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ELMDsKWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ELMDtKWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_yw4xIPPnEeinaYo1FpF9OA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_81bYM_PnEeinaYo1FpF9OA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_81bYNPPnEeinaYo1FpF9OA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_81bYNfPnEeinaYo1FpF9OA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ELMDsaWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ELMDsqWcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ELMDs6WcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_ELrL5KWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qeHpsPPnEeinaYo1FpF9OA" target="_ELrL4KWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ELrL5aWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ELrL6aWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ELrL5qWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ELrL56WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ELrL6KWcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EL9fxKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_zUAsUfPnEeinaYo1FpF9OA" target="_EL9fwKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EL9fxaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EL-G0KWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_zUAsUPPnEeinaYo1FpF9OA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EL9fxqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EL9fx6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EL9fyKWcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EMgSVKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_s45qEPPnEeinaYo1FpF9OA" target="_EMgSUKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EMgSVaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EMgSWaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EMgSVqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EMgSV6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EMgSWKWcEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EMz0VKWcEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_z7yeAPPnEeinaYo1FpF9OA" target="_EMz0UKWcEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_EMz0VaWcEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_EMz0WaWcEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPhotonicMedia.uml#_z7sXYPPnEeinaYo1FpF9OA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EMz0VqWcEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EMz0V6WcEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EMz0WKWcEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_ZjmhsG70EeqLWtFsc04LIg">
diff --git a/UML/TapiPhotonicMedia.uml b/UML/TapiPhotonicMedia.uml
index 050b0e8d..7763d856 100644
--- a/UML/TapiPhotonicMedia.uml
+++ b/UML/TapiPhotonicMedia.uml
@@ -39,7 +39,7 @@ License: This module is distributed under the Apache License 2.0</body>
         </ownedComment>
         <supplier xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XCHpEHZpEeiPPoPDo3q5jA" name="OtsiGCepSpecAugmentsCep" client="_mXvsEHZlEeiPPoPDo3q5jA">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XCHpEHZpEeiPPoPDo3q5jA" name="OtsiGCepSpecAugmentsCep" client="_UyBxsBKOEeajhbtskMXJfw">
         <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_fhWN4HiHEeiPPoPDo3q5jA" name="OtsiSipHasOtsiCapabilityPac" memberEnd="_fhbGYHiHEeiPPoPDo3q5jA _fhbtcHiHEeiPPoPDo3q5jA">
@@ -253,8 +253,62 @@ License: This module is distributed under the Apache License 2.0</body>
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_G9hIMG90EeqLWtFsc04LIg" name="otsiserviceinterfacepointspec" type="_EqncAHiHEeiPPoPDo3q5jA" association="_G9TFwG90EeqLWtFsc04LIg"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_tmgvQJCGEeq3cZ7vVOAmSw" name="OtsiACsepHasOtsiConfigPac" memberEnd="_tmlAsJCGEeq3cZ7vVOAmSw _tms8gZCGEeq3cZ7vVOAmSw">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tmjLgJCGEeq3cZ7vVOAmSw" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tmjLgZCGEeq3cZ7vVOAmSw" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_tms8gZCGEeq3cZ7vVOAmSw" name="otsiaconnectivityserviceendpointspec" type="_j1MmMJCGEeq3cZ7vVOAmSw" association="_tmgvQJCGEeq3cZ7vVOAmSw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_osHXoKE2EeqPrpdMOOTlbQ" name="OtsiACsepSpecAugmentsCsep" client="_j1MmMJCGEeq3cZ7vVOAmSw">
+        <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_z-ex0KE4EeqPrpdMOOTlbQ" name="McaCsepSpecAugmentsCsep" client="_pqLs8KE3EeqPrpdMOOTlbQ">
+        <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_1ZmsAKE4EeqPrpdMOOTlbQ" name="McaCsepHasMcConfigPac" memberEnd="_1ZwdAKE4EeqPrpdMOOTlbQ _1Z2joKE4EeqPrpdMOOTlbQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1Zn6IKE4EeqPrpdMOOTlbQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ZohMKE4EeqPrpdMOOTlbQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_1Z2joKE4EeqPrpdMOOTlbQ" name="mediachannelaconnectivityserviceendpointspec" type="_pqLs8KE3EeqPrpdMOOTlbQ" association="_1ZmsAKE4EeqPrpdMOOTlbQ"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_kDRVgKE8EeqPrpdMOOTlbQ" name="McConfigPacHasPowerConfigPac" memberEnd="_kDTKsKE8EeqPrpdMOOTlbQ _kDZRU6E8EeqPrpdMOOTlbQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kDSjoKE8EeqPrpdMOOTlbQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kDSjoaE8EeqPrpdMOOTlbQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_kDZRU6E8EeqPrpdMOOTlbQ" name="mediachannelconfigpac" type="_awx_YJmYEeiOmuqNbykpsw" association="_kDRVgKE8EeqPrpdMOOTlbQ"/>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_UyBxsBKOEeajhbtskMXJfw" name="Diagrams">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_LytUoKE8EeqPrpdMOOTlbQ">
+        <body>TAPI 2.1.3 RC1</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="__wm_QKE8EeqPrpdMOOTlbQ">
+        <body>In RC2 replace with composition from MediaChannelConfigPac</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_4vKOwKGJEeqPrpdMOOTlbQ">
+        <body>Zero = full delegation</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Ee-r4KGKEeqPrpdMOOTlbQ">
+        <body>Zero = full delegation does not apply for MC</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_NEvZEKGQEeqPrpdMOOTlbQ">
+        <body>capacity attribute: total capacity of an MCA/OTSiMCA&#xD;
+Capacity may be omitted if spectrum is specified.&#xD;
+Capacity cannot be omitted if spectrum is not specified</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_dn05cKGnEeqPrpdMOOTlbQ">
+        <body>OTSiMCA Connectivity Service:&#xD;
+1) re-use MediaChannelAConnectivityServiceEndPointSpec, using CSEPHasServerCSEP recursive association&#xD;
+2) introduce new OTSiAMcConnectivityServiceEndPointSpec - allowing richer provisioning options</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_gQZQUKWbEeqJcvXkREZ1XQ">
+        <body>Deprecate explicit MCA CEP</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_wNB54KWgEeqJcvXkREZ1XQ">
+        <body>Deprecate explicit OTSiG/A CEP together with Fec Pac&#xD;
+(moved to OduTerminationAndClientAdaptationPac)</body>
+      </ownedComment>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_UyBxsBKOEeajhbtskMXJfw" name="Diagrams"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_bTHgIBKOEeajhbtskMXJfw" name="ObjectClasses">
       <packagedElement xmi:type="uml:Class" xmi:id="_KjQ3qhKOEeajhbtskMXJfw" name="OtsiGServerAdaptationPac">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_lIJUIHZfEeiPPoPDo3q5jA" name="numberOfOtsi" isReadOnly="true">
@@ -407,8 +461,11 @@ License: This module is distributed under the Apache License 2.0</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_PV7o0MG9EeiAg83ctgK3eQ" annotatedElement="_8MWlMMDSEeiXyMZOD9tv6w">
             <body>The central frequency of the laser. It is the oscillation frequency of the corresponding electromagnetic wave</body>
           </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SPU2UKGKEeqPrpdMOOTlbQ"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_9kM10MMrEei3gLXE4_XcoA" name="spectrum" type="_wB7jIHPYEeiPPoPDo3q5jA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uu2z0KGKEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9kM10MMrEei3gLXE4_XcoA" name="spectrum" type="_wB7jIHPYEeiPPoPDo3q5jA"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_F8ProHk6EeiO-c_khjKlFQ" name="applicationIdentifier" visibility="public" type="_KjQ3vRKOEeajhbtskMXJfw">
           <ownedComment xmi:type="uml:Comment" xmi:id="_F8ProXk6EeiO-c_khjKlFQ" annotatedElement="_F8ProHk6EeiO-c_khjKlFQ">
             <body>This attribute indicates the selected Application Identifier.</body>
@@ -420,30 +477,33 @@ License: This module is distributed under the Apache License 2.0</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_rb7nYLDsEeiUZaG2JnNtGQ" annotatedElement="_NK0yMHk6EeiO-c_khjKlFQ">
             <body>The modulation techniqu selected at the source.</body>
           </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_W29IwKGKEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_--VrgLXYEei8W-CGeBUOew" name="laserControl" type="_4qTT8LKeEei69qzpcujF2A">
           <ownedComment xmi:type="uml:Comment" xmi:id="_--VrgbXYEei8W-CGeBUOew" annotatedElement="_--VrgLXYEei8W-CGeBUOew">
             <body>Laser control can be FORCED-ON, FORCED-OFF or LASER-SHUTDOWN</body>
           </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X7S6oKGKEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_N9lv45s8EeikSLSDi2qpXA" name="_transmitPower" type="_-2cKkJs7EeikSLSDi2qpXA" aggregation="composite" association="_N9lv4Js8EeikSLSDi2qpXA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_8K--oLDsEeiUZaG2JnNtGQ" annotatedElement="_N9lv45s8EeikSLSDi2qpXA">
             <body>Transmit power as requested.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N9lv5ps8EeikSLSDi2qpXA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N9lv55s8EeikSLSDi2qpXA" value="1"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N9lv5ps8EeikSLSDi2qpXA"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_JfBWgLTdEeiF8sBzK2t1Sw" name="totalPowerWarnThresholdUpper">
           <ownedComment xmi:type="uml:Comment" xmi:id="_JfBWgbTdEeiF8sBzK2t1Sw" annotatedElement="_JfBWgLTdEeiF8sBzK2t1Sw">
             <body>Allows to configure the Upper power threshold which is expected to be different from Default, but within the Min and Max values specified as OTSi SIP capability.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZsKbUKGKEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_JfEZ0LTdEeiF8sBzK2t1Sw" name="totalPowerWarnThresholdLower">
           <ownedComment xmi:type="uml:Comment" xmi:id="_JfEZ0bTdEeiF8sBzK2t1Sw" annotatedElement="_JfEZ0LTdEeiF8sBzK2t1Sw">
             <body>Allows to configure the Lowerpower threshold which is expected to be different from Default, but within the Min and Max values specified as OTSi SIP capability.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aeOxcKGKEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_qzTdgHk7EeiO-c_khjKlFQ" name="FecPropertiesPac">
@@ -515,6 +575,10 @@ License: This module is distributed under the Apache License 2.0</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xeF8kJqPEeid4dfn4JFJZg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xeMDMJqPEeid4dfn4JFJZg" value="1"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_kDTKsKE8EeqPrpdMOOTlbQ" name="powermanagementconfigpac" type="_hZGL8G9wEeqLWtFsc04LIg" aggregation="composite" association="_kDRVgKE8EeqPrpdMOOTlbQ">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kDZRUaE8EeqPrpdMOOTlbQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kDZRUqE8EeqPrpdMOOTlbQ" value="1"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_aiExkJozEeiOmuqNbykpsw" name="MediaChannelConnectionEndPointSpec">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_qOx7ApozEeiOmuqNbykpsw" name="_mediaChannel" type="_nBhMkI6cEeeyZasfnNSonw" isReadOnly="true" aggregation="composite" association="_qOr0YJozEeiOmuqNbykpsw">
@@ -657,6 +721,29 @@ at the Logical-Termination-Point (LTP) associated to the SIP.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_pqLs8KE3EeqPrpdMOOTlbQ" name="MediaChannelAConnectivityServiceEndPointSpec">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_1ZwdAKE4EeqPrpdMOOTlbQ" name="_mcConfig" type="_awx_YJmYEeiOmuqNbykpsw" aggregation="composite" association="_1ZmsAKE4EeqPrpdMOOTlbQ">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1cF38KE7EeqPrpdMOOTlbQ" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_2YCbcKE-EeqPrpdMOOTlbQ" name="numberOfMc">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_2YCbcaE-EeqPrpdMOOTlbQ" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_BscEEKGQEeqPrpdMOOTlbQ" name="capacity">
+          <type xmi:type="uml:DataType" href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I2SboKGQEeqPrpdMOOTlbQ"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_j1MmMJCGEeq3cZ7vVOAmSw" name="OtsiAConnectivityServiceEndPointSpec">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_tmlAsJCGEeq3cZ7vVOAmSw" name="_otsiConfig" type="_XVi5wHk6EeiO-c_khjKlFQ" aggregation="composite" association="_tmgvQJCGEeq3cZ7vVOAmSw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3hUioKGJEeqPrpdMOOTlbQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tms8gJCGEeq3cZ7vVOAmSw" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_qngMoKE-EeqPrpdMOOTlbQ" name="numberOfOTSi">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_zqZwgKE-EeqPrpdMOOTlbQ" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_gyFqQBKOEeajhbtskMXJfw" name="TypeDefinitions">
       <packagedElement xmi:type="uml:DataType" xmi:id="_KjQ3vRKOEeajhbtskMXJfw" name="ApplicationIdentifier" isLeaf="true">
@@ -1329,4 +1416,41 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenModel_Profile:StrictComposite xmi:id="_ERfi4IJkEeqLl4tIPv2RCg" base_Association="_1vwGkG9xEeqLWtFsc04LIg"/>
   <OpenModel_Profile:StrictComposite xmi:id="_H2D10IJkEeqLl4tIPv2RCg" base_Association="_7KK18G9zEeqLWtFsc04LIg"/>
   <OpenModel_Profile:StrictComposite xmi:id="_L6UVcIJkEeqLl4tIPv2RCg" base_Association="_G9TFwG90EeqLWtFsc04LIg"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_j1N0UJCGEeq3cZ7vVOAmSw" base_Class="_j1MmMJCGEeq3cZ7vVOAmSw"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_j1YzcJCGEeq3cZ7vVOAmSw" base_Class="_j1MmMJCGEeq3cZ7vVOAmSw"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_tmlAsZCGEeq3cZ7vVOAmSw" base_Property="_tmlAsJCGEeq3cZ7vVOAmSw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_tmruYJCGEeq3cZ7vVOAmSw" base_StructuralFeature="_tmlAsJCGEeq3cZ7vVOAmSw"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_tms8gpCGEeq3cZ7vVOAmSw" base_Property="_tms8gZCGEeq3cZ7vVOAmSw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_tmtjkJCGEeq3cZ7vVOAmSw" base_StructuralFeature="_tms8gZCGEeq3cZ7vVOAmSw"/>
+  <OpenModel_Profile:StrictComposite xmi:id="_AXrvQJCHEeq3cZ7vVOAmSw" base_Association="_tmgvQJCGEeq3cZ7vVOAmSw"/>
+  <OpenModel_Profile:Specify xmi:id="_rjE9sKE2EeqPrpdMOOTlbQ" base_Abstraction="_osHXoKE2EeqPrpdMOOTlbQ">
+    <target>/TapiCommon:Context:_context/TapiConnectivity:ConnectivityContext:_connectivityService/TapiConnectivity:ConnectivityService:_endPoint</target>
+  </OpenModel_Profile:Specify>
+  <OpenModel_Profile:OpenModelClass xmi:id="_pqMUAKE3EeqPrpdMOOTlbQ" base_Class="_pqLs8KE3EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_pqTBsKE3EeqPrpdMOOTlbQ" base_Class="_pqLs8KE3EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_1ZwdAaE4EeqPrpdMOOTlbQ" base_Property="_1ZwdAKE4EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_1Z1VgKE4EeqPrpdMOOTlbQ" base_StructuralFeature="_1ZwdAKE4EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_1Z2joaE4EeqPrpdMOOTlbQ" base_Property="_1Z2joKE4EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_1Z2joqE4EeqPrpdMOOTlbQ" base_StructuralFeature="_1Z2joKE4EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:Specify xmi:id="_cL6fEKE5EeqPrpdMOOTlbQ" base_Abstraction="_z-ex0KE4EeqPrpdMOOTlbQ">
+    <target>/TapiCommon:Context:_context/TapiConnectivity:ConnectivityContext:_connectivityService/TapiConnectivity:ConnectivityService:_endPoint</target>
+  </OpenModel_Profile:Specify>
+  <OpenModel_Profile:StrictComposite xmi:id="_5hCmAKE5EeqPrpdMOOTlbQ" base_Association="_1ZmsAKE4EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_kDTKsaE8EeqPrpdMOOTlbQ" base_Property="_kDTKsKE8EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_kDZRUKE8EeqPrpdMOOTlbQ" base_StructuralFeature="_kDTKsKE8EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_kDZRVKE8EeqPrpdMOOTlbQ" base_Property="_kDZRU6E8EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_kDZ4YKE8EeqPrpdMOOTlbQ" base_StructuralFeature="_kDZRU6E8EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:StrictComposite xmi:id="_vvWiIKE8EeqPrpdMOOTlbQ" base_Association="_kDRVgKE8EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_qngzsKE-EeqPrpdMOOTlbQ" base_Property="_qngMoKE-EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_qnmTQKE-EeqPrpdMOOTlbQ" base_StructuralFeature="_qngMoKE-EeqPrpdMOOTlbQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_2YDCgKE-EeqPrpdMOOTlbQ" base_Property="_2YCbcKE-EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_2YYZsKE-EeqPrpdMOOTlbQ" base_StructuralFeature="_2YCbcKE-EeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:Deprecated xmi:id="_Hrm1AKE_EeqPrpdMOOTlbQ" base_Element="_O0PLkHkwEeiO-c_khjKlFQ"/>
+  <OpenModel_Profile:Deprecated xmi:id="_NC_wcKE_EeqPrpdMOOTlbQ" base_Element="_Es15AJmWEeiOmuqNbykpsw"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_BscEEaGQEeqPrpdMOOTlbQ" base_Property="_BscEEKGQEeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_BshjoKGQEeqPrpdMOOTlbQ" base_StructuralFeature="_BscEEKGQEeqPrpdMOOTlbQ"/>
+  <OpenModel_Profile:Deprecated xmi:id="_fcz3QKWbEeqJcvXkREZ1XQ" base_Element="_WCN9oJqMEeid4dfn4JFJZg"/>
+  <OpenModel_Profile:Deprecated xmi:id="_1OGnEKWgEeqJcvXkREZ1XQ" base_Element="_mXvsEHZlEeiPPoPDo3q5jA"/>
+  <OpenModel_Profile:Deprecated xmi:id="_HyxcIKWhEeqJcvXkREZ1XQ" base_Element="_qzTdgHk7EeiO-c_khjKlFQ"/>
+  <OpenModel_Profile:Deprecated xmi:id="_L-qNwKWhEeqJcvXkREZ1XQ" base_Element="_KjQ3qhKOEeajhbtskMXJfw"/>
 </xmi:XMI>
diff --git a/UML/TapiTopology.notation b/UML/TapiTopology.notation
index afc718ba..d64994b6 100644
--- a/UML/TapiTopology.notation
+++ b/UML/TapiTopology.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_717IwDBCEea4fKwSGMr6CA" type="PapyrusUMLClassDiagram" name="DataTypes" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_BzvyEDBDEea4fKwSGMr6CA" type="DataType_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_BzvyETBDEea4fKwSGMr6CA" type="DataType_NameLabel"/>
@@ -148,7 +148,7 @@
     <children xmi:type="notation:Shape" xmi:id="_Es669TBKEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_Es669jBKEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Es66-DBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiTopology.uml#_rNbewL1-EeWdore3Cxez9g"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_rNbewL1-EeWdore3Cxez9g"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Es669zBKEeaSroGqGbZ6jg" x="382" y="35"/>
@@ -156,7 +156,7 @@
     <children xmi:type="notation:Shape" xmi:id="_EtN1qDBKEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_EtN1qTBKEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EtN1qzBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="TapiTopology.uml#_smkSYL1yEeWdore3Cxez9g"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_smkSYL1yEeWdore3Cxez9g"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EtN1qjBKEeaSroGqGbZ6jg" x="222" y="32"/>
@@ -164,7 +164,7 @@
     <children xmi:type="notation:Shape" xmi:id="_eQTKgD6iEeai_egNtQKqQA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_eQTKgT6iEeai_egNtQKqQA" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_eQTKgz6iEeai_egNtQKqQA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="TapiTopology.uml#_EuZIcD6gEeai_egNtQKqQA"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_EuZIcD6gEeai_egNtQKqQA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eQTKgj6iEeai_egNtQKqQA" x="200"/>
@@ -685,7 +685,7 @@
     <children xmi:type="notation:Shape" xmi:id="_EqsGNjBKEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_EqsGNzBKEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EqsGOTBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_VZkuoC6BEea0_JngOlSKcA"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiCommon.uml#_VZkuoC6BEea0_JngOlSKcA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EqsGODBKEeaSroGqGbZ6jg" x="678" y="441"/>
@@ -1376,7 +1376,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WvSaaTBDEea4fKwSGMr6CA"/>
       </children>
       <element xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WvSalzBDEea4fKwSGMr6CA" x="588" y="177" height="245"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WvSalzBDEea4fKwSGMr6CA" x="588" y="177" height="364"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_WvSaojBDEea4fKwSGMr6CA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_WvSaozBDEea4fKwSGMr6CA" type="Class_NameLabel"/>
@@ -1722,7 +1722,7 @@
     <children xmi:type="notation:Shape" xmi:id="_ElL69TBKEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ElL69jBKEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ElL6-DBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ElL69zBKEeaSroGqGbZ6jg" x="213" y="57"/>
@@ -1769,213 +1769,213 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r05PgUwCEeewALXL7BvPYw" x="172" y="-6" height="88"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o4c1cIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4c1cYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4c1c4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xPrp0KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xPrp0aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xPrp06GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4c1coWVEeqR8PjK46Cjgg" x="781" y="-29"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xPrp0qGnEeqPrpdMOOTlbQ" x="781" y="-29"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o46vgIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o46vgYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o46vg4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xQErYKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xQErYaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQFScKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o46vgoWVEeqR8PjK46Cjgg" x="781" y="-129"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQErYqGnEeqPrpdMOOTlbQ" x="781" y="-129"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o5KAEIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o5KAEYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5KnIIWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xQPDcKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xQPDcaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQPDc6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW8dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o5KAEoWVEeqR8PjK46Cjgg" x="331" y="116"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQPDcqGnEeqPrpdMOOTlbQ" x="331" y="116"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o5jBoIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o5jBoYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5jBo4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xQdF4KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xQdF4aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQdF46GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o5jBooWVEeqR8PjK46Cjgg" x="788" y="177"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQdF4qGnEeqPrpdMOOTlbQ" x="788" y="177"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o6bycIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o6bycYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6byc4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRDi0KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRDi0aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRDi06GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o6bycoWVEeqR8PjK46Cjgg" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRDi0qGnEeqPrpdMOOTlbQ" x="788" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o6h5EIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o6h5EYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6h5E4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRKQgKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRKQgaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRKQg6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o6h5EoWVEeqR8PjK46Cjgg" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRKQgqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o6n_sIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o6n_sYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6omwIWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRPwEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRPwEaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRPwE6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o6n_soWVEeqR8PjK46Cjgg" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRPwEqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o6uGUIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o6uGUYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6utYIWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRVPoKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRVPoaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRVPo6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o6uGUoWVEeqR8PjK46Cjgg" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRVPoqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o6zl4IWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o6zl4YWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6zl44WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRaIIKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRaIIaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRaII6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o6zl4oWVEeqR8PjK46Cjgg" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRaIIqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o65FcIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o65FcYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o65Fc4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRgOwKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRgOwaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRgOw6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o65FcoWVEeqR8PjK46Cjgg" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRgOwqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o7I9EIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o7I9EYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7I9E4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xRr086GnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xRr09KGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRscAKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW_dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7I9EoWVEeqR8PjK46Cjgg" x="-128" y="-33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRr09aGnEeqPrpdMOOTlbQ" x="-128" y="-33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o7h-oIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o7h-oYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7h-o4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xR3bIqGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xR3bI6GnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xR3bJaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXB9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7h-ooWVEeqR8PjK46Cjgg" x="330" y="211"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xR3bJKGnEeqPrpdMOOTlbQ" x="330" y="211"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o75yEIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o75yEYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o75yE4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xSCaQKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xSCaQaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSCaQ6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o75yEoWVEeqR8PjK46Cjgg" x="-133" y="106"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xSCaQqGnEeqPrpdMOOTlbQ" x="-133" y="106"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o80_IIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o80_IYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o80_I4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xSxaEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xSxaEaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSyBIKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_CM28EN72EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o80_IoWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xSxaEqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o86esIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o86esYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o86es4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xS4u0KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xS4u0aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xS4u06GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_rJUvAN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o86esoWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xS4u0qGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o8_-QIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o8_-QYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o8_-Q4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTAqoKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTAqoaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTAqo6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#__ET2wN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o8_-QoWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTAqoqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o9E2wIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9E2wYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9Fd0IWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTHYUKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTHYUaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTHYU6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_WSiGUN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9E2woWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTHYUqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o9KWUIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9KWUYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9KWU4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTOtEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTOtEaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTOtE6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_cQkyEN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9KWUoWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTOtEqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o9Qc8IWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9Qc8YWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9Qc84WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTTlkKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTUMoKGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTUMoqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kZ4bgN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9Qc8oWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTUMoaGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o9V8gIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9V8gYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9V8g4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTaTQKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTaTQaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTaTQ6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_gJx4QN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9V8goWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTaTQqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o9a1AIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9a1AYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9a1A4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTfLwKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTfLwaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTfLw6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IZggAN8AEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9a1AoWVEeqR8PjK46Cjgg" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTfLwqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o9qsoIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9qsoYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9qso4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xTo8wKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xTo8waGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTo8w6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXXNyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9qsooWVEeqR8PjK46Cjgg" x="-66" y="515"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTo8wqGnEeqPrpdMOOTlbQ" x="-66" y="515"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o-DuMIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o-DuMYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o-DuM4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xT1xEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xT1xEaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xT1xE6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o-DuMoWVEeqR8PjK46Cjgg" x="343" y="480"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xT1xEqGnEeqPrpdMOOTlbQ" x="343" y="480"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o-hoQIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o-hoQYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o-hoQ4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xUIE8KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xUIE8aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUIE86GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXGdyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o-hoQoWVEeqR8PjK46Cjgg" x="333" y="318"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUIE8qGnEeqPrpdMOOTlbQ" x="333" y="318"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o_LvkIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o_LvkYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_Lvk4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xUeqQKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xUeqQaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUeqQ6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW99yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o_LvkoWVEeqR8PjK46Cjgg" x="-131" y="447"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUeqQqGnEeqPrpdMOOTlbQ" x="-131" y="447"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_o_jjAIWVEeqR8PjK46Cjgg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o_jjAYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_jjA4WVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_xUrekKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xUrekaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUrek6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o_jjAoWVEeqR8PjK46Cjgg" x="372" y="-6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUrekqGnEeqPrpdMOOTlbQ" x="372" y="-6"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_SFF5oTBDEea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_SFF5ojBDEea4fKwSGMr6CA"/>
@@ -2087,7 +2087,7 @@
       <element xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G_CegouHEeiu6boZkiJHCA" points="[721, 94, -643984, -643984]$[726, 177, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H-0ggIuHEeiu6boZkiJHCA" id="(0.22826086956521738,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IWFxAIuHEeiu6boZkiJHCA" id="(0.19444444444444445,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IWFxAIuHEeiu6boZkiJHCA" id="(0.1718377088305489,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_JpiV4IuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvSX4DBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_JpiV44uHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -2111,7 +2111,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_JpiV4YuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JpiV4ouHEeiu6boZkiJHCA" points="[726, 177, -643984, -643984]$[721, 94, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KsY6AIuHEeiu6boZkiJHCA" id="(0.7847222222222222,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KsY6AIuHEeiu6boZkiJHCA" id="(0.7923627684964201,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L1geMIuHEeiu6boZkiJHCA" id="(0.8442028985507246,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_OkjeYIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvbikTBDEea4fKwSGMr6CA" target="_r05PgEwCEeewALXL7BvPYw">
@@ -2258,6 +2258,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_jltkAYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jltkAouHEeiu6boZkiJHCA" points="[588, 215, -643984, -643984]$[358, 82, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__gVsAKGnEeqPrpdMOOTlbQ" id="(0.1718377088305489,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lq-AUIuHEeiu6boZkiJHCA" id="(1.0,0.5113636363636364)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_tDE2UIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvSYxjBDEea4fKwSGMr6CA">
@@ -2282,6 +2283,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_tDE2UYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tDE2UouHEeiu6boZkiJHCA" points="[588, 252, -643984, -643984]$[380, 184, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ktOoKGnEeqPrpdMOOTlbQ" id="(0.0,0.11813186813186813)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uPaGkIuHEeiu6boZkiJHCA" id="(1.0,0.5588235294117647)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_wlHZsIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_Wvbh0DBDEea4fKwSGMr6CA">
@@ -2306,7 +2308,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_wlHZsYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlHZsouHEeiu6boZkiJHCA" points="[588, 280, -643984, -643984]$[428, 259, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xxzPQIuHEeiu6boZkiJHCA" id="(0.0,0.35918367346938773)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xxzPQIuHEeiu6boZkiJHCA" id="(0.0,0.22802197802197802)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykkwAIuHEeiu6boZkiJHCA" id="(1.0,0.9310344827586207)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2A9XUIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvlTcTBDEea4fKwSGMr6CA">
@@ -2331,7 +2333,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_2A9XUYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2A9XUouHEeiu6boZkiJHCA" points="[588, 327, -643984, -643984]$[421, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Bve4IuHEeiu6boZkiJHCA" id="(0.0,0.746938775510204)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Bve4IuHEeiu6boZkiJHCA" id="(0.0,0.5027472527472527)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_395lIIuHEeiu6boZkiJHCA" id="(1.0,0.29577464788732394)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_5Y3HQIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvlS0DBDEea4fKwSGMr6CA">
@@ -2356,268 +2358,268 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_5Y3HQYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5Y3HQouHEeiu6boZkiJHCA" points="[588, 370, -643984, -643984]$[366, 480, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6U9jIIuHEeiu6boZkiJHCA" id="(0.0,0.9918367346938776)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6U9jIIuHEeiu6boZkiJHCA" id="(0.0,0.6675824175824175)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7VAD0IuHEeiu6boZkiJHCA" id="(1.0,0.3626373626373626)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o4c1dIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvSX4DBDEea4fKwSGMr6CA" target="_o4c1cIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o4c1dYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4dcgoWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xPrp1KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSX4DBDEea4fKwSGMr6CA" target="_xPrp0KGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xPrp1aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xPsQ4aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o4c1doWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4dcgIWVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4dcgYWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xPrp1qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xPrp16GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xPsQ4KGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o46vhIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_G_CegIuHEeiu6boZkiJHCA" target="_o46vgIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o46vhYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o46viYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xQFScaGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_G_CegIuHEeiu6boZkiJHCA" target="_xQErYKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xQFScqGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQFSdqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o46vhoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o46vh4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o46viIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xQFSc6GnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQFSdKGnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQFSdaGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o5KnIYWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvSYxjBDEea4fKwSGMr6CA" target="_o5KAEIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o5KnIoWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5KnJoWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xQPDdKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSYxjBDEea4fKwSGMr6CA" target="_xQPDcKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xQPDdaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQPDeaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW8dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5KnI4WVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5KnJIWVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5KnJYWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xQPDdqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQPDd6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQPDeKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o5jBpIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvSZKTBDEea4fKwSGMr6CA" target="_o5jBoIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o5jBpYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5jBqYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xQdF5KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSZKTBDEea4fKwSGMr6CA" target="_xQdF4KGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xQdF5aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQdF6aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5jBpoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5jBp4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5jBqIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xQdF5qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQdF56GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQdF6KGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o6bydIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_JpiV4IuHEeiu6boZkiJHCA" target="_o6bycIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o6bydYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6byeYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRDi1KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_JpiV4IuHEeiu6boZkiJHCA" target="_xRDi0KGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRDi1aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRDi2aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o6bydoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6byd4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6byeIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRDi1qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRDi16GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRDi2KGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o6h5FIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_jltkAIuHEeiu6boZkiJHCA" target="_o6h5EIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o6h5FYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6h5GYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRKQhKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_jltkAIuHEeiu6boZkiJHCA" target="_xRKQgKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRKQhaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRKQiaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o6h5FoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6h5F4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6h5GIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRKQhqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRKQh6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRKQiKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o6omwYWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_tDE2UIuHEeiu6boZkiJHCA" target="_o6n_sIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o6omwoWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6omxoWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRPwFKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_tDE2UIuHEeiu6boZkiJHCA" target="_xRPwEKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRPwFaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRQXIaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o6omw4WVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6omxIWVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6omxYWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRPwFqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRPwF6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRQXIKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o6utYYWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_wlHZsIuHEeiu6boZkiJHCA" target="_o6uGUIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o6utYoWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6utZoWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRVPpKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_wlHZsIuHEeiu6boZkiJHCA" target="_xRVPoKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRVPpaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRVPqaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o6utY4WVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6utZIWVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6utZYWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRVPpqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRVPp6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRVPqKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o6zl5IWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_2A9XUIuHEeiu6boZkiJHCA" target="_o6zl4IWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o6zl5YWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o6zl6YWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRaIJKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_2A9XUIuHEeiu6boZkiJHCA" target="_xRaIIKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRaIJaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRaIKaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o6zl5oWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6zl54WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o6zl6IWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRaIJqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRaIJ6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRaIKKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o65FdIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_5Y3HQIuHEeiu6boZkiJHCA" target="_o65FcIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o65FdYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o65FeYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRgOxKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_5Y3HQIuHEeiu6boZkiJHCA" target="_xRgOwKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRgOxaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRgOyaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o65FdoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o65Fd4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o65FeIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRgOxqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRgOx6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRgOyKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o7I9FIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvSaojBDEea4fKwSGMr6CA" target="_o7I9EIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o7I9FYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7I9GYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xRscAaGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSaojBDEea4fKwSGMr6CA" target="_xRr086GnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xRscAqGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRscBqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW_dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o7I9FoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7I9F4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7I9GIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRscA6GnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRscBKGnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRscBaGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o7h-pIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_Wvbh0DBDEea4fKwSGMr6CA" target="_o7h-oIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o7h-pYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7h-qYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xR3bJqGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_Wvbh0DBDEea4fKwSGMr6CA" target="_xR3bIqGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xR3bJ6GnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xR3bK6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXB9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o7h-poWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7h-p4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7h-qIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xR3bKKGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xR3bKaGnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xR3bKqGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o75yFIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvbikTBDEea4fKwSGMr6CA" target="_o75yEIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o75yFYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o75yGYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xSCaRKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvbikTBDEea4fKwSGMr6CA" target="_xSCaQKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xSCaRaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSCaSaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o75yFoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o75yF4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o75yGIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xSCaRqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSCaR6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSCaSKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o80_JIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_7c87YIuGEeiu6boZkiJHCA" target="_o80_IIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o80_JYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o80_KYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xSyBIaGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_7c87YIuGEeiu6boZkiJHCA" target="_xSxaEKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xSyBIqGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSyBJqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_CM28EN72EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o80_JoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o80_J4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o80_KIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xSyBI6GnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSyBJKGnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSyBJaGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o86etIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="__ZY7wIuGEeiu6boZkiJHCA" target="_o86esIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o86etYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o86euYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xS4u1KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="__ZY7wIuGEeiu6boZkiJHCA" target="_xS4u0KGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xS4u1aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xS4u2aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_rJUvAN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o86etoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o86et4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o86euIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xS4u1qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xS4u16GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xS4u2KGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o8_-RIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_CtslIIuHEeiu6boZkiJHCA" target="_o8_-QIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o8_-RYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o8_-SYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTAqpKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_CtslIIuHEeiu6boZkiJHCA" target="_xTAqoKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTAqpaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTAqqaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#__ET2wN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o8_-RoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o8_-R4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o8_-SIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTAqpqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTAqp6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTAqqKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o9Fd0YWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_OkjeYIuHEeiu6boZkiJHCA" target="_o9E2wIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o9Fd0oWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9Fd1oWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTHYVKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_OkjeYIuHEeiu6boZkiJHCA" target="_xTHYUKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTHYVaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTH_YKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_WSiGUN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9Fd04WVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9Fd1IWVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9Fd1YWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTHYVqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTHYV6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTHYWKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o9KWVIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_RNDKoIuHEeiu6boZkiJHCA" target="_o9KWUIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o9KWVYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9K9YoWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTOtFKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_RNDKoIuHEeiu6boZkiJHCA" target="_xTOtEKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTOtFaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTOtGaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_cQkyEN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9KWVoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9K9YIWVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9K9YYWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTOtFqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTOtF6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTOtGKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o9Qc9IWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_ZCnYsIuHEeiu6boZkiJHCA" target="_o9Qc8IWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o9Qc9YWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9Qc-YWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTUMo6GnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_ZCnYsIuHEeiu6boZkiJHCA" target="_xTTlkKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTUMpKGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTUMqKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kZ4bgN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9Qc9oWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9Qc94WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9Qc-IWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTUMpaGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTUMpqGnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTUMp6GnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o9V8hIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_b4wfYIuHEeiu6boZkiJHCA" target="_o9V8gIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o9V8hYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9V8iYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTaTRKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_b4wfYIuHEeiu6boZkiJHCA" target="_xTaTQKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTaTRaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTaTSaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_gJx4QN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9V8hoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9V8h4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9V8iIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTaTRqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTaTR6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTaTSKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o9a1BIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_e2FMIIuHEeiu6boZkiJHCA" target="_o9a1AIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o9a1BYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9bcEIWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTfLxKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_e2FMIIuHEeiu6boZkiJHCA" target="_xTfLwKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTfLxaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTfLyaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IZggAN8AEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9a1BoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9a1B4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9a1CIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTfLxqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTfLx6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTfLyKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o9qspIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvblRTBDEea4fKwSGMr6CA" target="_o9qsoIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o9qspYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9qsqYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xTo8xKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvblRTBDEea4fKwSGMr6CA" target="_xTo8wKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xTo8xaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTo8yaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXXNyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9qspoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9qsp4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9qsqIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTo8xqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTo8x6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTo8yKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o-EVQIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvlS0DBDEea4fKwSGMr6CA" target="_o-DuMIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o-EVQYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o-EVRYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xT1xFKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvlS0DBDEea4fKwSGMr6CA" target="_xT1xEKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xT1xFaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xT1xGaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o-EVQoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o-EVQ4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o-EVRIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xT1xFqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xT1xF6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xT1xGKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o-hoRIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvlTcTBDEea4fKwSGMr6CA" target="_o-hoQIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o-hoRYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o-hoSYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xUIE9KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvlTcTBDEea4fKwSGMr6CA" target="_xUIE8KGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xUIE9aGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUIE-aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXGdyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o-hoRoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o-hoR4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o-hoSIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUIE9qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUIE96GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUIE-KGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o_LvlIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_WvlUkzBDEea4fKwSGMr6CA" target="_o_LvkIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o_LvlYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_LvmYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xUeqRKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvlUkzBDEea4fKwSGMr6CA" target="_xUeqQKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xUeqRaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUeqSaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW99yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o_LvloWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_Lvl4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_LvmIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUeqRqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUeqR6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUeqSKGnEeqPrpdMOOTlbQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_o_jjBIWVEeqR8PjK46Cjgg" type="StereotypeCommentLink" source="_r05PgEwCEeewALXL7BvPYw" target="_o_jjAIWVEeqR8PjK46Cjgg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_o_jjBYWVEeqR8PjK46Cjgg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_jjCYWVEeqR8PjK46Cjgg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_xUrelKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_r05PgEwCEeewALXL7BvPYw" target="_xUrekKGnEeqPrpdMOOTlbQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xUrelaGnEeqPrpdMOOTlbQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUremaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o_jjBoWVEeqR8PjK46Cjgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_jjB4WVEeqR8PjK46Cjgg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_jjCIWVEeqR8PjK46Cjgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUrelqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUrel6GnEeqPrpdMOOTlbQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUremKGnEeqPrpdMOOTlbQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_d6faUDBDEea4fKwSGMr6CA" type="PapyrusUMLClassDiagram" name="TopologyServiceSkeleton" measurementUnit="Pixel">
@@ -2805,12 +2807,12 @@
     <children xmi:type="notation:Shape" xmi:id="_3RaDw0m0EeaKuvClDq6rqA" type="StereotypeComment">
       <children xmi:type="notation:BasicCompartment" xmi:id="_3RaDzUm0EeaKuvClDq6rqA" type="StereotypeCompartment">
         <children xmi:type="notation:DecorationNode" xmi:id="_3RaD0Um0EeaKuvClDq6rqA" visible="false" type="StereotypeProperty">
-          <element xmi:type="uml:Property" href="/TapiModel/OpenModel_Profile.profile.uml#_9vsisBdoEeatXPvf_dRw8w"/>
+          <element xmi:type="ecore:EObject" href="/TapiModel/OpenModel_Profile.profile.uml#_9vsisBdoEeatXPvf_dRw8w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_3RaD0km0EeaKuvClDq6rqA"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_3RaDzkm0EeaKuvClDq6rqA" showTitle="true"/>
         <styles xmi:type="notation:StringValueStyle" xmi:id="_3RaDz0m0EeaKuvClDq6rqA" name="stereotype" stringValue="OpenModel_Profile::OpenModelElement"/>
-        <element xmi:type="uml:Stereotype" href="/TapiModel/OpenModel_Profile.profile.uml#_txYE0BdoEeatXPvf_dRw8w"/>
+        <element xmi:type="ecore:EObject" href="/TapiModel/OpenModel_Profile.profile.uml#_txYE0BdoEeatXPvf_dRw8w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3RaD0Em0EeaKuvClDq6rqA"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_3RaDxEm0EeaKuvClDq6rqA" showTitle="true"/>
@@ -4493,4 +4495,8 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4R-UaIZqEeqZobVcFzbEhg"/>
     </edges>
   </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_-TQ04KGnEeqPrpdMOOTlbQ">
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  </css:ModelStyleSheets>
 </xmi:XMI>

From b9d5817f95869c3b78ec390a5fc7f92436b66fe3 Mon Sep 17 00:00:00 2001
From: amazzini <andrea.mazzini@nokia.com>
Date: Wed, 3 Jun 2020 16:03:19 +0200
Subject: [PATCH 2/6] The saved Photonic model

---
 UML/TapiPhotonicMedia.notation | 4 ++--
 UML/TapiPhotonicMedia.uml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UML/TapiPhotonicMedia.notation b/UML/TapiPhotonicMedia.notation
index f4f56cc8..bbd22a2d 100644
--- a/UML/TapiPhotonicMedia.notation
+++ b/UML/TapiPhotonicMedia.notation
@@ -4653,11 +4653,11 @@
     <edges xsi:type="notation:Connector" xmi:id="_dbbkUJozEeiOmuqNbykpsw" type="Abstraction_Edge" source="_a2-DgpozEeiOmuqNbykpsw" target="_SvF9cJozEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_dbbkU5ozEeiOmuqNbykpsw" type="Abstraction_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Jl7kEJo0EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVJozEeiOmuqNbykpsw" x="98" y="110"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVJozEeiOmuqNbykpsw" x="-76" y="120"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_dbbkVZozEeiOmuqNbykpsw" type="Abstraction_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JmgL0Jo0EeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVpozEeiOmuqNbykpsw" x="69" y="94"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dbbkVpozEeiOmuqNbykpsw" x="-103" y="100"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_dbbkUZozEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
diff --git a/UML/TapiPhotonicMedia.uml b/UML/TapiPhotonicMedia.uml
index 7763d856..c817ef6f 100644
--- a/UML/TapiPhotonicMedia.uml
+++ b/UML/TapiPhotonicMedia.uml
@@ -305,7 +305,7 @@ Capacity cannot be omitted if spectrum is not specified</body>
         <body>Deprecate explicit MCA CEP</body>
       </ownedComment>
       <ownedComment xmi:type="uml:Comment" xmi:id="_wNB54KWgEeqJcvXkREZ1XQ">
-        <body>Deprecate explicit OTSiG/A CEP together with Fec Pac&#xD;
+        <body>Deprecate explicit OTSiA CEP together with Fec Pac&#xD;
 (moved to OduTerminationAndClientAdaptationPac)</body>
       </ownedComment>
     </packagedElement>

From 6513ea2d69a3991155d6a5b35778617e05549d4e Mon Sep 17 00:00:00 2001
From: amazzini <andrea.mazzini@nokia.com>
Date: Fri, 5 Jun 2020 00:47:21 +0200
Subject: [PATCH 3/6] Removed LocalClass inheritance from ResilienceRoute class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Typos in Resilience Route Priority comment
Notification: Added “DEVICE” to ObjectType
(the EquipmentObjectType enum in eqp model cannot extend ObjectType enum
defined in Notification)
Other minor adjustments checking "model validation"
---
 UML/TapiCommon.notation         |  347 +-
 UML/TapiConnectivity.notation   | 1431 +++----
 UML/TapiConnectivity.uml        |    4 +-
 UML/TapiEquipment.notation      | 6388 +++++++++++++++----------------
 UML/TapiEquipment.uml           |    5 +-
 UML/TapiNotification.notation   | 3256 ++++++++--------
 UML/TapiNotification.uml        |    3 +-
 UML/TapiTopology.notation       |  654 ++--
 UML/TapiVirtualNetwork.notation |  784 ++--
 UML/TapiVirtualNetwork.uml      |    6 +-
 10 files changed, 6487 insertions(+), 6391 deletions(-)

diff --git a/UML/TapiCommon.notation b/UML/TapiCommon.notation
index 0ce8665a..1bdc9c7a 100644
--- a/UML/TapiCommon.notation
+++ b/UML/TapiCommon.notation
@@ -727,53 +727,53 @@
       <element xmi:type="uml:Enumeration" href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-exDkYk2Eeil5oKL3Vgl-g" x="180" y="143"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Kt-EkKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Kt-EkaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Kt-Ek6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g4xtAKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g4xtAaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g4xtA6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:DataType" href="TapiCommon.uml#_FRi-QNnWEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kt-EkqBUEeqPrpdMOOTlbQ" x="240" y="351"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g4xtAqauEeqJcvXkREZ1XQ" x="240" y="351"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_KvZA4KBUEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_KvZA4aBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KvZA46BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g5BkoKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g5BkoaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5Bko6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_adPI0NnqEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KvZA4qBUEeqPrpdMOOTlbQ" x="920" y="154"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g5BkoqauEeqJcvXkREZ1XQ" x="920" y="154"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_KzfdwKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_KzfdwaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Kzfdw6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g5OY86auEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g5OY9KauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5PAAKauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_2wdyENnjEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KzfdwqBUEeqPrpdMOOTlbQ" x="542" y="7"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g5OY9aauEeqJcvXkREZ1XQ" x="542" y="7"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_K0390KBUEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0390aBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K03906BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g5eQkKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g5eQkaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5eQk6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_pGsZEN5qEeWd9KDn6x5Skg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0390qBUEeqPrpdMOOTlbQ" x="797" y="146"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g5eQkqauEeqJcvXkREZ1XQ" x="797" y="146"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_K1ZiQKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_K1ZiQaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K1ZiQ6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g5k-QKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g5k-QaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5k-Q6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_i92HIL6PEeWRz-VHgA3LJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K1ZiQqBUEeqPrpdMOOTlbQ" x="219" y="140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g5k-QqauEeqJcvXkREZ1XQ" x="219" y="140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_LAvPkKBUEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_LAvPkaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LAvPk6BUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g6wC8KauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g6wC8aauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6wC86auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LAvPkqBUEeqPrpdMOOTlbQ" x="380" y="143"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g6wC8qauEeqJcvXkREZ1XQ" x="380" y="143"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_6CIXQTA_Eea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_6CIXQjA_Eea4fKwSGMr6CA"/>
@@ -781,65 +781,65 @@
       <owner xmi:type="uml:Package" href="TapiCommon.uml#_XqBXAC5wEea0_JngOlSKcA"/>
     </styles>
     <element xmi:type="uml:Package" href="TapiCommon.uml#_XqBXAC5wEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_Kt-roKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9tz_FDA_Eea4fKwSGMr6CA" target="_Kt-EkKBUEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Kt-roaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Kt-rpaBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g4xtBKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9tz_FDA_Eea4fKwSGMr6CA" target="_g4xtAKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g4xtBaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g4xtCaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:DataType" href="TapiCommon.uml#_FRi-QNnWEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kt-roqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kt-ro6BUEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kt-rpKBUEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g4xtBqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g4xtB6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g4xtCKauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_KvZA5KBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9tz_uzA_Eea4fKwSGMr6CA" target="_KvZA4KBUEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_KvZA5aBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KvZA6aBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g5BkpKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9tz_uzA_Eea4fKwSGMr6CA" target="_g5BkoKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g5BkpaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5BkqaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_adPI0NnqEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KvZA5qBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KvZA56BUEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KvZA6KBUEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g5BkpqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5Bkp6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5BkqKauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_KzfdxKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9t0ACTA_Eea4fKwSGMr6CA" target="_KzfdwKBUEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_KzfdxaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KzfdyaBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g5PAAaauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9t0ACTA_Eea4fKwSGMr6CA" target="_g5OY86auEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g5PAAqauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5PABqauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_2wdyENnjEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KzfdxqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kzfdx6BUEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KzfdyKBUEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g5PAA6auEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5PABKauEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5PABaauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_K0391KBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9t0AjjA_Eea4fKwSGMr6CA" target="_K0390KBUEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_K0391aBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K0392aBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g5eQlKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9t0AjjA_Eea4fKwSGMr6CA" target="_g5eQkKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g5eQlaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5eQmaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_pGsZEN5qEeWd9KDn6x5Skg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K0391qBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K03916BUEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K0392KBUEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g5eQlqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5eQl6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5eQmKauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_K1ZiRKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_9t0AtDA_Eea4fKwSGMr6CA" target="_K1ZiQKBUEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_K1ZiRaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K1ZiSaBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g5k-RKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9t0AtDA_Eea4fKwSGMr6CA" target="_g5k-QKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g5k-RaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g5k-SaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_i92HIL6PEeWRz-VHgA3LJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K1ZiRqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K1ZiR6BUEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K1ZiSKBUEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g5k-RqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5k-R6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g5k-SKauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_LAv2oKBUEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_-exDkIk2Eeil5oKL3Vgl-g" target="_LAvPkKBUEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_LAv2oaBUEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LAv2paBUEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g6wC9KauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-exDkIk2Eeil5oKL3Vgl-g" target="_g6wC8KauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g6wC9aauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6wC-aauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LAv2oqBUEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LAv2o6BUEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LAv2pKBUEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g6wC9qauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6wC96auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6wC-KauEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_iE1WsD3fEea-1_BGg-qcjQ" type="PapyrusUMLClassDiagram" name="Context" measurementUnit="Pixel">
@@ -2008,47 +2008,131 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lv95DmJFEeek3OrhDuslYQ"/>
       </children>
       <element xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lv9R8WJFEeek3OrhDuslYQ" x="322" y="330" height="99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lv9R8WJFEeek3OrhDuslYQ" x="660" y="460" width="461" height="161"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_r7udsHpnEeqMpJXtwtppeQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_r7udsXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r7uds3pnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g90lEKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g90lEaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g90lE6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r7udsnpnEeqMpJXtwtppeQ" x="358" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g90lEqauEeqJcvXkREZ1XQ" x="358" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_r86wgHpnEeqMpJXtwtppeQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_r86wgXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r86wg3pnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g-TtQKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g-TtQaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-TtQ6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiCommon.uml#_AFtdUEwDEeewALXL7BvPYw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r86wgnpnEeqMpJXtwtppeQ" x="358" y="-80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g-TtQqauEeqJcvXkREZ1XQ" x="358" y="-80"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_r9D6cHpnEeqMpJXtwtppeQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_r9D6cXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r9D6c3pnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g-Zz4KauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g-Zz4aauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-Zz46auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiCommon.uml#_S3giAO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9D6cnpnEeqMpJXtwtppeQ" x="358" y="-80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g-Zz4qauEeqJcvXkREZ1XQ" x="358" y="-80"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_r9h0gHpnEeqMpJXtwtppeQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_r9h0gXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r9h0g3pnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g-laEKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g-laEaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-laE6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9h0gnpnEeqMpJXtwtppeQ" x="281" y="333"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g-laEqauEeqJcvXkREZ1XQ" x="281" y="333"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_r-hTAHpnEeqMpJXtwtppeQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_r-hTAXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r-h6EHpnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_g-6xQKauEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g-6xQaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-6xQ6auEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r-hTAnpnEeqMpJXtwtppeQ" x="522" y="330"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g-6xQqauEeqJcvXkREZ1XQ" x="522" y="330"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_sryoEKauEeqJcvXkREZ1XQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_sryoEqauEeqJcvXkREZ1XQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sryoE6auEeqJcvXkREZ1XQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sryoFKauEeqJcvXkREZ1XQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_srzPIKauEeqJcvXkREZ1XQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_umG_sKauEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_umG_saauEeqJcvXkREZ1XQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_umIN0KauEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_umIN0aauEeqJcvXkREZ1XQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_srzPIaauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_srzPIqauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_srzPI6auEeqJcvXkREZ1XQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_srzPJKauEeqJcvXkREZ1XQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_srzPJaauEeqJcvXkREZ1XQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_srzPJqauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_srzPJ6auEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_srzPKKauEeqJcvXkREZ1XQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_srzPKaauEeqJcvXkREZ1XQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_srzPKqauEeqJcvXkREZ1XQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_srzPK6auEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_srzPLKauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_srzPLaauEeqJcvXkREZ1XQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_srzPLqauEeqJcvXkREZ1XQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_tjWBYD3fEea-1_BGg-qcjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sryoEaauEeqJcvXkREZ1XQ" x="60" y="540"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_sr-1U6auEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_sr-1VKauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sr-1VqauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_tjWBYD3fEea-1_BGg-qcjQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sr-1VaauEeqJcvXkREZ1XQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tKLNMKauEeqJcvXkREZ1XQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tKLNMqauEeqJcvXkREZ1XQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tKLNM6auEeqJcvXkREZ1XQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tKLNNKauEeqJcvXkREZ1XQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tKLNNaauEeqJcvXkREZ1XQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_vtZX4KauEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vtZX4aauEeqJcvXkREZ1XQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_vtZX4qauEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vtZX46auEeqJcvXkREZ1XQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tKLNNqauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tKLNN6auEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tKLNOKauEeqJcvXkREZ1XQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKLNOaauEeqJcvXkREZ1XQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tKLNOqauEeqJcvXkREZ1XQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tKLNO6auEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tKLNPKauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tKLNPaauEeqJcvXkREZ1XQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKLNPqauEeqJcvXkREZ1XQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tKLNP6auEeqJcvXkREZ1XQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tKLNQKauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tKLNQaauEeqJcvXkREZ1XQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tKLNQqauEeqJcvXkREZ1XQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKLNQ6auEeqJcvXkREZ1XQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_zC-54D3fEea-1_BGg-qcjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKLNMaauEeqJcvXkREZ1XQ" x="400" y="560"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tKWzY6auEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tKWzZKauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tKWzZqauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_zC-54D3fEea-1_BGg-qcjQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKWzZaauEeqJcvXkREZ1XQ" x="200"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_-RwAgU0WEeaqn4OIuRCwEg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_-R5KcE0WEeaqn4OIuRCwEg"/>
@@ -2102,77 +2186,104 @@
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_HLeD4It6Eeiu6boZkiJHCA" type="Association_Edge" source="__w77UE0WEeaqn4OIuRCwEg" target="_lv9R8GJFEeek3OrhDuslYQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_HLeD44t6Eeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeD5It6Eeiu6boZkiJHCA" x="13" y="6"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_otEvwKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeD5It6Eeiu6boZkiJHCA" x="13" y="3"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_HLeD5Yt6Eeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeD5ot6Eeiu6boZkiJHCA" x="-11" y="-1"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ouH4oKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeD5ot6Eeiu6boZkiJHCA" x="-10"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_HLeq8It6Eeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq8Yt6Eeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ovWnsKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq8Yt6Eeiu6boZkiJHCA" x="27" y="-18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_HLeq8ot6Eeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq84t6Eeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_owmk4KauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq84t6Eeiu6boZkiJHCA" x="-28" y="16"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_HLeq9It6Eeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq9Yt6Eeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ox17AKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq9Yt6Eeiu6boZkiJHCA" x="26" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_HLeq9ot6Eeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq94t6Eeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ozMl4KauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HLeq94t6Eeiu6boZkiJHCA" x="-27" y="-19"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_HLeD4Yt6Eeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiCommon.uml#_S3giAO_tEeWLlrwIF3w0vA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HLeD4ot6Eeiu6boZkiJHCA" points="[370, 229, -643984, -643984]$[425, 330, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IDFBUIt6Eeiu6boZkiJHCA" id="(0.8330134357005758,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IDFBUIt6Eeiu6boZkiJHCA" id="(0.8308270676691729,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o05PAKauEeqJcvXkREZ1XQ" id="(0.3036876355748373,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_r7udtHpnEeqMpJXtwtppeQ" type="StereotypeCommentLink" source="__w77UE0WEeaqn4OIuRCwEg" target="_r7udsHpnEeqMpJXtwtppeQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_r7udtXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r7uduXpnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g90lFKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__w77UE0WEeaqn4OIuRCwEg" target="_g90lEKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g90lFaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g91MIqauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r7udtnpnEeqMpJXtwtppeQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r7udt3pnEeqMpJXtwtppeQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r7uduHpnEeqMpJXtwtppeQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g90lFqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g91MIKauEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g91MIaauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_r86whHpnEeqMpJXtwtppeQ" type="StereotypeCommentLink" source="_FMo_sIt6Eeiu6boZkiJHCA" target="_r86wgHpnEeqMpJXtwtppeQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_r86whXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r86wiXpnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g-TtRKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_FMo_sIt6Eeiu6boZkiJHCA" target="_g-TtQKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g-TtRaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-TtSaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiCommon.uml#_AFtdUEwDEeewALXL7BvPYw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r86whnpnEeqMpJXtwtppeQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r86wh3pnEeqMpJXtwtppeQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r86wiHpnEeqMpJXtwtppeQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g-TtRqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-TtR6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-TtSKauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_r9D6dHpnEeqMpJXtwtppeQ" type="StereotypeCommentLink" source="_HLeD4It6Eeiu6boZkiJHCA" target="_r9D6cHpnEeqMpJXtwtppeQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_r9D6dXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r9D6eXpnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g-Zz5KauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_HLeD4It6Eeiu6boZkiJHCA" target="_g-Zz4KauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g-Zz5aauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-Zz6aauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiCommon.uml#_S3giAO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r9D6dnpnEeqMpJXtwtppeQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9D6d3pnEeqMpJXtwtppeQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9D6eHpnEeqMpJXtwtppeQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g-Zz5qauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-Zz56auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-Zz6KauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_r9h0hHpnEeqMpJXtwtppeQ" type="StereotypeCommentLink" source="_9lEFgEwCEeewALXL7BvPYw" target="_r9h0gHpnEeqMpJXtwtppeQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_r9h0hXpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r9h0iXpnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g-laFKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9lEFgEwCEeewALXL7BvPYw" target="_g-laEKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g-laFaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-laGaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r9h0hnpnEeqMpJXtwtppeQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9h0h3pnEeqMpJXtwtppeQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9h0iHpnEeqMpJXtwtppeQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g-laFqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-laF6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-laGKauEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_r-h6EXpnEeqMpJXtwtppeQ" type="StereotypeCommentLink" source="_lv9R8GJFEeek3OrhDuslYQ" target="_r-hTAHpnEeqMpJXtwtppeQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_r-h6EnpnEeqMpJXtwtppeQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r-h6FnpnEeqMpJXtwtppeQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_g-6xRKauEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lv9R8GJFEeek3OrhDuslYQ" target="_g-6xQKauEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g-6xRaauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g-6xSaauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r-h6E3pnEeqMpJXtwtppeQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r-h6FHpnEeqMpJXtwtppeQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r-h6FXpnEeqMpJXtwtppeQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g-6xRqauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-6xR6auEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g-6xSKauEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_sr-1V6auEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_sryoEKauEeqJcvXkREZ1XQ" target="_sr-1U6auEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_sr-1WKauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sr-1XKauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_tjWBYD3fEea-1_BGg-qcjQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sr-1WaauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sr-1WqauEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sr-1W6auEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_tKWzZ6auEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tKLNMKauEeqJcvXkREZ1XQ" target="_tKWzY6auEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_tKWzaKauEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tKWzbKauEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_zC-54D3fEea-1_BGg-qcjQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tKWzaaauEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tKWzaqauEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tKWza6auEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_vmLIQKeVEeeBGPv_1DT5og" type="PapyrusUMLClassDiagram" name="CommonPacs" measurementUnit="Pixel">
diff --git a/UML/TapiConnectivity.notation b/UML/TapiConnectivity.notation
index b4eaccdc..54b94628 100644
--- a/UML/TapiConnectivity.notation
+++ b/UML/TapiConnectivity.notation
@@ -127,7 +127,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G92_jBFEeam35bpdXJzEw"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G93LDBFEeam35bpdXJzEw" x="208" y="-280" width="303" height="241"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G93LDBFEeam35bpdXJzEw" x="208" y="-280" width="393" height="281"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_0HHioDBFEeam35bpdXJzEw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_0HHioTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
@@ -1006,149 +1006,149 @@
       <element xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OAa1aEeiIjuV0HZnJAQ" x="-282" y="-183" height="141"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mGSbgIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mGSbgYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mGSbg4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wsu4gKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wsu4gaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wsu4g6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGSbgoZ0EeqZobVcFzbEhg" x="422" y="56"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wsu4gqavEeqJcvXkREZ1XQ" x="422" y="56"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mHbD8IZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mHbD8YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHbD84Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wtOAsKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wtOAsaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtOAs6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mHbD8oZ0EeqZobVcFzbEhg" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtOAsqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mHhxoIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mHhxoYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHhxo4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wtVVcKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wtVVcaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtVVc6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mHhxooZ0EeqZobVcFzbEhg" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtVVcqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mHofUIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mHofUYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHofU4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wtdRQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wtdRQaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtdRQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mHofUoZ0EeqZobVcFzbEhg" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtdRQqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mHvNAIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mHvNAYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHvNA4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wtnCQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wtnCQaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtnCQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mHvNAoZ0EeqZobVcFzbEhg" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtnCQqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mH1ToIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mH1ToYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mH1To4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wtu-EKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wtu-EaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtu-E6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mH1TooZ0EeqZobVcFzbEhg" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtu-EqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mH7aQIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mH7aQYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mH8BUIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wt2S0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wt2S0aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wt2S06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mH7aQoZ0EeqZobVcFzbEhg" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wt2S0qavEeqJcvXkREZ1XQ" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mIaicIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mIaicYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mIaic4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wuAq4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wuAq4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuAq46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mIaicoZ0EeqZobVcFzbEhg" x="408" y="-280"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wuAq4qavEeqJcvXkREZ1XQ" x="408" y="-280"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mKEvUIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mKEvUYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mKEvU4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wuvDo6avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wuvDpKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuvDpqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKEvUoZ0EeqZobVcFzbEhg" x="919" y="220"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wuvDpaavEeqJcvXkREZ1XQ" x="919" y="220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mLTeYIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mLTeYYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mLTeY4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wvTrYKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wvTrYaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvUScKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mLTeYoZ0EeqZobVcFzbEhg" x="919" y="120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wvTrYqavEeqJcvXkREZ1XQ" x="919" y="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mLaMEIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mLaMEYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mLaME4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wvaZEKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wvaZEaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvaZE6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mLaMEoZ0EeqZobVcFzbEhg" x="919" y="120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wvaZEqavEeqJcvXkREZ1XQ" x="919" y="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mLzNoIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mLzNoYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mLz0sIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wvlYMKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wvlYMaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvlYM6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mLzNooZ0EeqZobVcFzbEhg" x="918" y="13"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wvlYMqavEeqJcvXkREZ1XQ" x="918" y="13"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mMnF8IZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mMnF8YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mMntAIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wv3FAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wv3FAaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wv3sEKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mMnF8oZ0EeqZobVcFzbEhg" x="300" y="315"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wv3FAqavEeqJcvXkREZ1XQ" x="300" y="315"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mOANEIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mOANEYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mOANE4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wwkPoKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wwkPoaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wwkPo6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mOANEoZ0EeqZobVcFzbEhg" x="-100" y="-456"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wwkPoqavEeqJcvXkREZ1XQ" x="-100" y="-456"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mOxpIIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mOxpIYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mOyQMIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_ww3xoKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ww3xoaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ww3xo6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mOxpIoZ0EeqZobVcFzbEhg" x="-83" y="185"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ww3xoqavEeqJcvXkREZ1XQ" x="-83" y="185"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mQC0cIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mQC0cYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQC0c4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wxakMKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wxakMaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wxakM6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQC0coZ0EeqZobVcFzbEhg" x="-81" y="-28"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxakMqavEeqJcvXkREZ1XQ" x="-81" y="-28"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mRiCMIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mRiCMYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mRiCM4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wyOcgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wyOcgaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wyOcg6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mRiCMoZ0EeqZobVcFzbEhg" x="915" y="-296"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wyOcgqavEeqJcvXkREZ1XQ" x="915" y="-296"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mTWAEIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mTWAEYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mTWnIIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wzFYIKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wzFYIaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wzFYI6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mTWAEoZ0EeqZobVcFzbEhg" x="-82" y="-183"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wzFYIqavEeqJcvXkREZ1XQ" x="-82" y="-183"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_vmgeMTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_vmgeMjBFEeam35bpdXJzEw"/>
@@ -1227,7 +1227,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_xDbXQYuQEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xDbXQouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zRejMIuQEeiu6boZkiJHCA" id="(0.10561056105610561,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zRejMIuQEeiu6boZkiJHCA" id="(0.08142493638676845,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y-LMsIuQEeiu6boZkiJHCA" id="(0.06711409395973154,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_z_dqkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
@@ -1252,7 +1252,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_z_dqkYuQEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z_dqkouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1udjAIuQEeiu6boZkiJHCA" id="(0.8976897689768977,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1udjAIuQEeiu6boZkiJHCA" id="(0.6921119592875318,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Weg0IuQEeiu6boZkiJHCA" id="(0.8456375838926175,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_3JCDkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0G91jDBFEeam35bpdXJzEw">
@@ -1278,7 +1278,7 @@
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3JCDkouQEeiu6boZkiJHCA" points="[359, 23, -643984, -643984]$[365, -58, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXm6IK1dEeiIjuV0HZnJAQ" id="(0.4597315436241611,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bhqvUK1YEeiIjuV0HZnJAQ" id="(0.5016501650165016,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bhqvUK1YEeiIjuV0HZnJAQ" id="(0.38676844783715014,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_8oadYIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_BDPgIP4xEea_VPdGG2-szQ" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_8obEcIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -1628,185 +1628,185 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r3NsAIEIEeqLl4tIPv2RCg" id="(0.8,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r3NsAYEIEeqLl4tIPv2RCg" id="(1.0,0.5601092896174863)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mGSbhIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_0G9yhzBFEeam35bpdXJzEw" target="_mGSbgIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mGSbhYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mGTCkIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wsu4hKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0G9yhzBFEeam35bpdXJzEw" target="_wsu4gKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wsu4haavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wsvfkKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mGSbhoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGSbh4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGSbiIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wsu4hqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wsu4h6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wsu4iKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mHbD9IZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_lT2KsIuQEeiu6boZkiJHCA" target="_mHbD8IZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mHbD9YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHbD-YZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wtOAtKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lT2KsIuQEeiu6boZkiJHCA" target="_wtOAsKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wtOAtaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtOAuaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mHbD9oZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHbD94Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHbD-IZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtOAtqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtOAt6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtOAuKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mHhxpIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_3JCDkIuQEeiu6boZkiJHCA" target="_mHhxoIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mHhxpYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHhxqYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wtVVdKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3JCDkIuQEeiu6boZkiJHCA" target="_wtVVcKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wtVVdaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtV8gaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mHhxpoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHhxp4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHhxqIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtVVdqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtVVd6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtV8gKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mHofVIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_8oadYIuQEeiu6boZkiJHCA" target="_mHofUIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mHofVYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHofWYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wtdRRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8oadYIuQEeiu6boZkiJHCA" target="_wtdRQKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wtdRRaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtdRSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mHofVoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHofV4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHofWIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtdRRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtdRR6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtdRSKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mHvNBIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_DM_ksIuREeiu6boZkiJHCA" target="_mHvNAIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mHvNBYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mHvNCYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wtnCRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DM_ksIuREeiu6boZkiJHCA" target="_wtnCQKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wtnCRaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtnCSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mHvNBoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHvNB4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHvNCIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtnCRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtnCR6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtnCSKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mH16sIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_G3oqcIuREeiu6boZkiJHCA" target="_mH1ToIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mH16sYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mH16tYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wtu-FKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_G3oqcIuREeiu6boZkiJHCA" target="_wtu-EKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wtu-FaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtu-GaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mH16soZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mH16s4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mH16tIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtu-FqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtu-F6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtu-GKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mH8BUYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_W6DjoK1bEeiIjuV0HZnJAQ" target="_mH7aQIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mH8BUoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mH8BVoZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wt2S1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_W6DjoK1bEeiIjuV0HZnJAQ" target="_wt2S0KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wt2S1aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wt2S2aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mH8BU4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mH8BVIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mH8BVYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wt2S1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wt2S16avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wt2S2KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mIaidIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_0G91jDBFEeam35bpdXJzEw" target="_mIaicIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mIaidYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mIaieYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wuBR8KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0G91jDBFEeam35bpdXJzEw" target="_wuAq4KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wuBR8aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuBR9aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mIaidoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mIaid4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mIaieIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuBR8qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuBR86avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuBR9KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mKEvVIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_0HHioDBFEeam35bpdXJzEw" target="_mKEvUIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mKEvVYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mKEvWYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wuvDp6avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0HHioDBFEeam35bpdXJzEw" target="_wuvDo6avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wuvDqKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuvqsqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mKEvVoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mKEvV4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mKEvWIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuvDqaavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuvqsKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuvqsaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mLTeZIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_S_bisIuREeiu6boZkiJHCA" target="_mLTeYIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mLTeZYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mLTeaYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wvUScaavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_S_bisIuREeiu6boZkiJHCA" target="_wvTrYKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wvUScqavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvUSdqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mLTeZoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLTeZ4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLTeaIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wvUSc6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvUSdKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvUSdaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mLaMFIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_ZFXmMIuREeiu6boZkiJHCA" target="_mLaMEIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mLaMFYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mLaMGYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wvaZFKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ZFXmMIuREeiu6boZkiJHCA" target="_wvaZEKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wvaZFaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvaZGaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mLaMFoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLaMF4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLaMGIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wvaZFqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvaZF6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvaZGKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mLz0sYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_0HHjqDBFEeam35bpdXJzEw" target="_mLzNoIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mLz0soZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mLz0toZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wvlYNKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0HHjqDBFEeam35bpdXJzEw" target="_wvlYMKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wvlYNaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvlYOaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mLz0s4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLz0tIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLz0tYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wvlYNqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvlYN6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvlYOKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mMntAYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_0HHlMDBFEeam35bpdXJzEw" target="_mMnF8IZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mMntAoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mMntBoZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wv3sEaavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0HHlMDBFEeam35bpdXJzEw" target="_wv3FAKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wv3sEqavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wv3sFqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mMntA4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mMntBIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mMntBYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wv3sE6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wv3sFKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wv3sFaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mOANFIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_rwI9oPlIEeaQEoLj_Ia_cg" target="_mOANEIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mOANFYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mOANGYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wwkPpKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_rwI9oPlIEeaQEoLj_Ia_cg" target="_wwkPoKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wwkPpaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wwkPqaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mOANFoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mOANF4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mOANGIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wwkPpqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wwkPp6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wwkPqKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mOyQMYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BDPgIP4xEea_VPdGG2-szQ" target="_mOxpIIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mOyQMoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mOyQNoZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_ww3xpKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BDPgIP4xEea_VPdGG2-szQ" target="_ww3xoKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ww3xpaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ww3xqaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mOyQM4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mOyQNIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mOyQNYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ww3xpqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ww3xp6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ww3xqKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mQC0dIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="__Y_BEIfVEeeirpBaj87qAw" target="_mQC0cIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mQC0dYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQC0eYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wxbLQKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__Y_BEIfVEeeirpBaj87qAw" target="_wxakMKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wxbLQaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wxbLRaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQC0doZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQC0d4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQC0eIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wxbLQqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wxbLQ6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wxbLRKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mRiCNIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_mRiCMIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mRiCNYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mRiCOYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wyOchKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_wyOcgKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wyOchaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wyOciaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mRiCNoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mRiCN4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mRiCOIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wyOchqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wyOch6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wyOciKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mTWnIYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="__j-OAK1aEeiIjuV0HZnJAQ" target="_mTWAEIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mTWnIoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mTWnJoZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wzFYJKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__j-OAK1aEeiIjuV0HZnJAQ" target="_wzFYIKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wzFYJaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wzFYKaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mTWnI4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mTWnJIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mTWnJYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wzFYJqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wzFYJ6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wzFYKKavEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_9y8uwDBFEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="ConnectivityServiceSkeleton" measurementUnit="Pixel">
@@ -2563,245 +2563,245 @@
       <element xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YdyUaLTEeeG6K0eZHmVww" x="834" y="-253" width="206" height="64"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mnBxEIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mnBxEYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mnBxE4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wheqw6avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wheqxKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wheqxqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mnBxEoZ0EeqZobVcFzbEhg" x="78" y="-3"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wheqxaavEeqJcvXkREZ1XQ" x="78" y="-3"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mnQakIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mnQakYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mnQak4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_whl_gKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_whl_gaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whl_g6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mnQakoZ0EeqZobVcFzbEhg" x="78" y="-103"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_whl_gqavEeqJcvXkREZ1XQ" x="78" y="-103"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mnZkgIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mnZkgYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mnaLkIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_whxlsKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_whxlsaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whxls6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mnZkgoZ0EeqZobVcFzbEhg" x="78" y="-103"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_whxlsqavEeqJcvXkREZ1XQ" x="78" y="-103"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mn7I8IZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mn7I8YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mn7I84Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wiLOUKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wiLOUaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiLOU6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mn7I8oZ0EeqZobVcFzbEhg" x="443" y="1"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wiLOUqavEeqJcvXkREZ1XQ" x="443" y="1"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_moLnoIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_moLnoYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moMOsIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wiWNcKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wiWNcaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiWNc6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_moLnooZ0EeqZobVcFzbEhg" x="443" y="-99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wiWNcqavEeqJcvXkREZ1XQ" x="443" y="-99"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_moS8YIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_moS8YYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moS8Y4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_widiMKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_widiMaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_widiM6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_moS8YoZ0EeqZobVcFzbEhg" x="443" y="-99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_widiMqavEeqJcvXkREZ1XQ" x="443" y="-99"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mow2cIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mow2cYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mow2c4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wiqWgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wiqWgaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiqWg6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mow2coZ0EeqZobVcFzbEhg" x="41" y="288"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wiqWgqavEeqJcvXkREZ1XQ" x="41" y="288"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mpZvoIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mpZvoYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mpZvo4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wi3K0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wi3K0aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wi3K06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mpZvooZ0EeqZobVcFzbEhg" x="1041" y="278"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wi3K0qavEeqJcvXkREZ1XQ" x="1041" y="278"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mqCBwIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mqCBwYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mqCBw4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wjKFwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wjKFwaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjKFw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqCBwoZ0EeqZobVcFzbEhg" x="358" y="284"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjKFwqavEeqJcvXkREZ1XQ" x="358" y="284"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mqc4gIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mqc4gYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mqdfkIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wjZWUKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wjZWUaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjZWU6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqc4goZ0EeqZobVcFzbEhg" x="42" y="-109"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjZWUqavEeqJcvXkREZ1XQ" x="42" y="-109"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mq5kcIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mq5kcYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mq5kc4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wjigQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wjigQaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjigQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mq5kcoZ0EeqZobVcFzbEhg" x="403" y="169"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjigQqavEeqJcvXkREZ1XQ" x="403" y="169"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mrcXAIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mrcXAYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mrcXA4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wjs4U6avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wjs4VKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjs4VqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrcXAoZ0EeqZobVcFzbEhg" x="348" y="425"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjs4VaavEeqJcvXkREZ1XQ" x="348" y="425"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mr_woIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mr_woYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mr_wo4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wj3QYKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wj3QYaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj3QY6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mr_wooZ0EeqZobVcFzbEhg" x="1043" y="82"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wj3QYqavEeqJcvXkREZ1XQ" x="1043" y="82"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_msQ2YIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_msQ2YYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_msRdcIZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wj9-EKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wj9-EaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj9-E6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_msQ2YoZ0EeqZobVcFzbEhg" x="1043" y="-18"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wj9-EqavEeqJcvXkREZ1XQ" x="1043" y="-18"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_msff4IZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_msff4YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_msff44Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wkHIAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wkHIAaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkHIA6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_msff4oZ0EeqZobVcFzbEhg" x="1043" y="-18"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkHIAqavEeqJcvXkREZ1XQ" x="1043" y="-18"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ms8y4IZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ms8y4YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ms8y44Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wkSHIKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wkSHIaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkSHI6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ms8y4oZ0EeqZobVcFzbEhg" x="213" y="-246"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkSHIqavEeqJcvXkREZ1XQ" x="213" y="-246"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mtMDcIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mtMDcYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtMDc4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wkYNwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wkYNwaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkYNw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mtMDcoZ0EeqZobVcFzbEhg" x="213" y="-346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkYNwqavEeqJcvXkREZ1XQ" x="213" y="-346"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mtSKEIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mtSKEYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtSKE4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wkdGQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wkdGQaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkdGQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mtSKEoZ0EeqZobVcFzbEhg" x="213" y="-346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkdGQqavEeqJcvXkREZ1XQ" x="213" y="-346"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mtYQsIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mtYQsYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtYQs4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wkil0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wkil0aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkil06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mtYQsoZ0EeqZobVcFzbEhg" x="213" y="-346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkil0qavEeqJcvXkREZ1XQ" x="213" y="-346"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mtygYIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mtygYYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtygY4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wksW06avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wksW1KavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wksW1qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mtygYoZ0EeqZobVcFzbEhg" x="818" y="78"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wksW1aavEeqJcvXkREZ1XQ" x="818" y="78"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_muaygIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_muaygYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_muayg4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wk4kEKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wk4kEaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk4kE6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_muaygoZ0EeqZobVcFzbEhg" x="1037" y="-92"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wk4kEqavEeqJcvXkREZ1XQ" x="1037" y="-92"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mupcAIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mupcAYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mupcA4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wk_RwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wk_RwaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk_Rw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mupcAoZ0EeqZobVcFzbEhg" x="1037" y="-192"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wk_RwqavEeqJcvXkREZ1XQ" x="1037" y="-192"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_muwJsIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_muwJsYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_muwJs4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wlGmgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wlGmgaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlGmg6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_muwJsoZ0EeqZobVcFzbEhg" x="1037" y="-192"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlGmgqavEeqJcvXkREZ1XQ" x="1037" y="-192"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mva4EIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mva4EYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mva4E4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wlSzwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wlSzwaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlSzw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mva4EoZ0EeqZobVcFzbEhg" x="749" y="-249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlSzwqavEeqJcvXkREZ1XQ" x="749" y="-249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mwIpwIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mwIpwYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mwIpw4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wldy4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wldy4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wldy46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwIpwoZ0EeqZobVcFzbEhg" x="771" y="290"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wldy4qavEeqJcvXkREZ1XQ" x="771" y="290"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mwWFIIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mwWFIYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mwWFI4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wlj5gKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wlj5gaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlj5g6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwWFIoZ0EeqZobVcFzbEhg" x="771" y="190"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlj5gqavEeqJcvXkREZ1XQ" x="771" y="190"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mwbksIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mwbksYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mwbks4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wlnj4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wlnj4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlnj46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwbksoZ0EeqZobVcFzbEhg" x="771" y="190"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlnj4qavEeqJcvXkREZ1XQ" x="771" y="190"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mw10YIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mw10YYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mw10Y4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wlzKE6avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wlzKFKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlzKFqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mw10YoZ0EeqZobVcFzbEhg" x="1034" y="-253"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlzKFaavEeqJcvXkREZ1XQ" x="1034" y="-253"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mxG6IIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mxG6IYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mxG6I4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wl6e0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wl6e0aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl6e06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxG6IoZ0EeqZobVcFzbEhg" x="1034" y="-353"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wl6e0qavEeqJcvXkREZ1XQ" x="1034" y="-353"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mxNAwIZ0EeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mxNAwYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mxNAw4Z0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_wl_XUKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wl_XUaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl_XU6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxNAwoZ0EeqZobVcFzbEhg" x="1034" y="-353"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wl_XUqavEeqJcvXkREZ1XQ" x="1034" y="-353"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_9y8uwTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_9y8uwjBFEeam35bpdXJzEw"/>
@@ -3635,305 +3635,305 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96a6wKSdEeiKJbr6a5Jjpg" id="(1.0,0.49206349206349204)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96bh0KSdEeiKJbr6a5Jjpg" id="(0.8596491228070176,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mnBxFIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU0MDBGEeam35bpdXJzEw" target="_mnBxEIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mnBxFYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mnBxGYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wheqx6avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU0MDBGEeam35bpdXJzEw" target="_wheqw6avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wheqyKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wheqzKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mnBxFoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnBxF4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnBxGIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wheqyaavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wheqyqavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wheqy6avEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mnQalIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_SVZ1oIuOEeiu6boZkiJHCA" target="_mnQakIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mnQalYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mnQamYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_whl_hKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_SVZ1oIuOEeiu6boZkiJHCA" target="_whl_gKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_whl_haavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whl_iaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mnQaloZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnQal4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnQamIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_whl_hqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whl_h6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whl_iKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mnaLkYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_YeNm8IuOEeiu6boZkiJHCA" target="_mnZkgIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mnaLkoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mnaLloZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_whxltKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YeNm8IuOEeiu6boZkiJHCA" target="_whxlsKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_whxltaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whxluaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mnaLk4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnaLlIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnaLlYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_whxltqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whxlt6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whxluKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mn7I9IZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU0cTBGEeam35bpdXJzEw" target="_mn7I8IZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mn7I9YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mn7I-YZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wiLOVKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU0cTBGEeam35bpdXJzEw" target="_wiLOUKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wiLOVaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiLOWaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mn7I9oZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mn7I94Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mn7I-IZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wiLOVqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiLOV6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiLOWKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_moMOsYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_jFNa0IuOEeiu6boZkiJHCA" target="_moLnoIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_moMOsoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moMOtoZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wiWNdKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_jFNa0IuOEeiu6boZkiJHCA" target="_wiWNcKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wiWNdaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiWNeaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_moMOs4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moMOtIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moMOtYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wiWNdqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiWNd6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiWNeKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_moS8ZIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_mliuAIuOEeiu6boZkiJHCA" target="_moS8YIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_moS8ZYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moS8aYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_widiNKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_mliuAIuOEeiu6boZkiJHCA" target="_widiMKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_widiNaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_widiOaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_moS8ZoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moS8Z4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moS8aIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_widiNqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_widiN6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_widiOKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mow2dIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU0sjBGEeam35bpdXJzEw" target="_mow2cIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mow2dYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mow2eYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wiqWhKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU0sjBGEeam35bpdXJzEw" target="_wiqWgKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wiqWhaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiqWiaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mow2doZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mow2d4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mow2eIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wiqWhqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiqWh6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiqWiKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mpZvpIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU1BDBGEeam35bpdXJzEw" target="_mpZvoIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mpZvpYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mpZvqYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wi3K1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU1BDBGEeam35bpdXJzEw" target="_wi3K0KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wi3K1aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wi3K2aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mpZvpoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mpZvp4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mpZvqIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wi3K1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wi3K16avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wi3K2KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mqCBxIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU1WTBGEeam35bpdXJzEw" target="_mqCBwIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mqCBxYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mqCByYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wjKFxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU1WTBGEeam35bpdXJzEw" target="_wjKFwKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wjKFxaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjKFyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mqCBxoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mqCBx4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mqCByIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjKFxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjKFx6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjKFyKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mqdfkYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU16TBGEeam35bpdXJzEw" target="_mqc4gIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mqdfkoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mqdfloZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wjZWVKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU16TBGEeam35bpdXJzEw" target="_wjZWUKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wjZWVaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjZWWaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mqdfk4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mqdflIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mqdflYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjZWVqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjZWV6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjZWWKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mq5kdIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU2QjBGEeam35bpdXJzEw" target="_mq5kcIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mq5kdYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mq5keYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wjigRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU2QjBGEeam35bpdXJzEw" target="_wjigQKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wjigRaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjigSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mq5kdoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mq5kd4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mq5keIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjigRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjigR6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjigSKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mrcXBIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU2tzBGEeam35bpdXJzEw" target="_mrcXAIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mrcXBYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mrcXCYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wjs4V6avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU2tzBGEeam35bpdXJzEw" target="_wjs4U6avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wjs4WKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjs4XKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mrcXBoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mrcXB4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mrcXCIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjs4WaavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjs4WqavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjs4W6avEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mr_wpIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_BlU3KDBGEeam35bpdXJzEw" target="_mr_woIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mr_wpYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mr_wqYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wj3QZKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU3KDBGEeam35bpdXJzEw" target="_wj3QYKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wj3QZaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj3QaaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mr_wpoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mr_wp4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mr_wqIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wj3QZqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj3QZ6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj3QaKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_msRdcYZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_unw4AIuOEeiu6boZkiJHCA" target="_msQ2YIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_msRdcoZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_msRddoZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wj9-FKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_unw4AIuOEeiu6boZkiJHCA" target="_wj9-EKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wj9-FaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj9-GaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_msRdc4Z0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_msRddIZ0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_msRddYZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wj9-FqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj9-F6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj9-GKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_msff5IZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="__VTMUIuOEeiu6boZkiJHCA" target="_msff4IZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_msff5YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_msff6YZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wkHIBKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__VTMUIuOEeiu6boZkiJHCA" target="_wkHIAKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wkHIBaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkHICaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_msff5oZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_msff54Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_msff6IZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkHIBqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkHIB6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkHICKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ms8y5IZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_e4LtYMhsEeaVlemTikmRHw" target="_ms8y4IZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ms8y5YZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ms8y6YZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wkSHJKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_e4LtYMhsEeaVlemTikmRHw" target="_wkSHIKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wkSHJaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkSHKaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ms8y5oZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ms8y54Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ms8y6IZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkSHJqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkSHJ6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkSHKKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mtMqgIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_EYfToBM4Eee0L_IMWjydgQ" target="_mtMDcIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mtMqgYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtMqhYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wkYNxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EYfToBM4Eee0L_IMWjydgQ" target="_wkYNwKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wkYNxaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkYNyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mtMqgoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtMqg4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtMqhIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkYNxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkYNx6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkYNyKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mtSKFIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_9msK4IuNEeiu6boZkiJHCA" target="_mtSKEIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mtSKFYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtSKGYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wkdGRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9msK4IuNEeiu6boZkiJHCA" target="_wkdGQKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wkdGRaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkdGSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mtSKFoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtSKF4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtSKGIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkdGRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkdGR6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkdGSKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mtYQtIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_ExLboIuOEeiu6boZkiJHCA" target="_mtYQsIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mtYQtYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtYQuYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wkjM4KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ExLboIuOEeiu6boZkiJHCA" target="_wkil0KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wkjM4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkjM5aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mtYQtoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtYQt4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtYQuIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkjM4qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkjM46avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkjM5KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mtygZIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_luMgoBMjEee0L_IMWjydgQ" target="_mtygYIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mtygZYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mtygaYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wksW16avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_luMgoBMjEee0L_IMWjydgQ" target="_wksW06avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wksW2KavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wksW3KavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mtygZoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtygZ4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtygaIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wksW2aavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wksW2qavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wksW26avEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_muayhIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_6_LyABMjEee0L_IMWjydgQ" target="_muaygIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_muayhYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_muayiYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wk4kFKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_6_LyABMjEee0L_IMWjydgQ" target="_wk4kEKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wk4kFaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk4kGaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_muayhoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_muayh4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_muayiIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wk4kFqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk4kF6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk4kGKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mupcBIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_yv1goIuOEeiu6boZkiJHCA" target="_mupcAIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mupcBYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mupcCYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wk_RxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_yv1goIuOEeiu6boZkiJHCA" target="_wk_RwKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wk_RxaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk_RyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mupcBoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mupcB4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mupcCIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wk_RxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk_Rx6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk_RyKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_muwwwIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_4u1OoIuOEeiu6boZkiJHCA" target="_muwJsIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_muwwwYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_muwwxYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wlGmhKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4u1OoIuOEeiu6boZkiJHCA" target="_wlGmgKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wlGmhaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlGmiaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_muwwwoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_muwww4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_muwwxIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlGmhqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlGmh6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlGmiKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mva4FIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_GbpwIBM2Eee0L_IMWjydgQ" target="_mva4EIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mva4FYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mva4GYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wlSzxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GbpwIBM2Eee0L_IMWjydgQ" target="_wlSzwKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wlSzxaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlSzyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mva4FoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mva4F4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mva4GIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlSzxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlSzx6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlSzyKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mwIpxIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_mwIpwIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mwIpxYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mwIpyYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wldy5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_wldy4KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wldy5aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wldy6aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mwIpxoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mwIpx4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mwIpyIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wldy5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wldy56avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wldy6KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mwWFJIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_XDTqEHIZEeeSiaQ95-6r9w" target="_mwWFIIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mwWFJYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mwWFKYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wlj5hKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_XDTqEHIZEeeSiaQ95-6r9w" target="_wlj5gKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wlj5haavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlj5iaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mwWFJoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mwWFJ4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mwWFKIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlj5hqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlj5h6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlj5iKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mwbktIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_IDRpEIuPEeiu6boZkiJHCA" target="_mwbksIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mwbktYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mwbkuYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wlnj5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_IDRpEIuPEeiu6boZkiJHCA" target="_wlnj4KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wlnj5aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wloK8qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mwbktoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mwbkt4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mwbkuIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlnj5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wloK8KavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wloK8aavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mw10ZIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_3YdyUKLTEeeG6K0eZHmVww" target="_mw10YIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mw10ZYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mw10aYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wlzxIKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3YdyUKLTEeeG6K0eZHmVww" target="_wlzKE6avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wlzxIaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlzxJaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mw10ZoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mw10Z4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mw10aIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlzxIqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlzxI6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlzxJKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mxG6JIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_DXw14KLUEeeG6K0eZHmVww" target="_mxG6IIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mxG6JYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mxG6KYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wl6e1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DXw14KLUEeeG6K0eZHmVww" target="_wl6e0KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wl6e1aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl6e2aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mxG6JoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mxG6J4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mxG6KIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wl6e1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl6e16avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl6e2KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mxNAxIZ0EeqZobVcFzbEhg" type="StereotypeCommentLink" source="_szL8AIuOEeiu6boZkiJHCA" target="_mxNAwIZ0EeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_mxNAxYZ0EeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mxNAyYZ0EeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_wl_XVKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_szL8AIuOEeiu6boZkiJHCA" target="_wl_XUKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wl_XVaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl_XWaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mxNAxoZ0EeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mxNAx4Z0EeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mxNAyIZ0EeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wl_XVqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl_XV6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl_XWKavEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_Hdao8DBGEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="EndPointDetails" measurementUnit="Pixel">
@@ -4436,7 +4436,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMIer0EeaeHOJw3lCT8A"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rR8Fcer0EeaeHOJw3lCT8A" x="6" y="255" height="250"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rR8Fcer0EeaeHOJw3lCT8A" x="20" y="520" width="521" height="321"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ryFlIOr0EeaeHOJw3lCT8A" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_ryFlIur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
@@ -4490,7 +4490,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlM-r0EeaeHOJw3lCT8A"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlIer0EeaeHOJw3lCT8A" x="385" y="180" height="161"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlIer0EeaeHOJw3lCT8A" x="706" y="481" width="516" height="241"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_s9Rl4Or0EeaeHOJw3lCT8A" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_s9Rl4ur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
@@ -4536,7 +4536,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl8-r0EeaeHOJw3lCT8A"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl4er0EeaeHOJw3lCT8A" x="27" y="46" height="175"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl4er0EeaeHOJw3lCT8A" x="40" y="200" height="175"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_QjgYUOsSEealN7CdLT_GPw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_Qjme8OsSEealN7CdLT_GPw" type="Class_NameLabel"/>
@@ -4578,7 +4578,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjmfAesSEealN7CdLT_GPw"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjgYUesSEealN7CdLT_GPw" x="439" y="-2" width="362" height="103"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjgYUesSEealN7CdLT_GPw" x="640" y="-140" width="461" height="141"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_W4xb0OsTEealN7CdLT_GPw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_W43icOsTEealN7CdLT_GPw" type="Class_NameLabel"/>
@@ -4636,7 +4636,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43igesTEealN7CdLT_GPw"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W4xb0esTEealN7CdLT_GPw" x="178" y="-306" width="312" height="189"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W4xb0esTEealN7CdLT_GPw" x="80" y="-320" width="401" height="241"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_jHqrg-scEealN7CdLT_GPw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_jHqrhOscEealN7CdLT_GPw" showTitle="true"/>
@@ -4714,7 +4714,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6pw-scEealN7CdLT_GPw"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6psescEealN7CdLT_GPw" x="820" y="-80" width="395" height="208"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6psescEealN7CdLT_GPw" x="1260" y="-320" width="601" height="321"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_hU2_M-seEealN7CdLT_GPw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_hU2_NOseEealN7CdLT_GPw" showTitle="true"/>
@@ -4766,21 +4766,13 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Lmxw4nJqEeq3NYg-TXSAxQ" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw43JqEeq3NYg-TXSAxQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_OSFgkHJqEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuFXJpEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_OSFgkXJqEeq3NYg-TXSAxQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_OYAiYHJqEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+        <children xmi:type="notation:Shape" xmi:id="_kC0fYKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
           <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuEnJpEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_OYAiYXJqEeq3NYg-TXSAxQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_EePDsIDKEeqLl4tIPv2RCg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_EePDsYDKEeqLl4tIPv2RCg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kC0fYaZnEeqJcvXkREZ1XQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_EeQR0IDKEeqLl4tIPv2RCg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_EeQR0YDKEeqLl4tIPv2RCg"/>
+        <children xmi:type="notation:Shape" xmi:id="_kC1GcKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuFXJpEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kC1GcaZnEeqJcvXkREZ1XQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw5HJqEeq3NYg-TXSAxQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw5XJqEeq3NYg-TXSAxQ"/>
@@ -4800,111 +4792,111 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw8XJqEeq3NYg-TXSAxQ"/>
       </children>
       <element xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LmxJ0XJqEeq3NYg-TXSAxQ" x="1060" y="180" width="381" height="201"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LmxJ0XJqEeq3NYg-TXSAxQ" x="820" y="140" width="381" height="121"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O5Eg8ILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O5Eg8YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O5Eg84LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w5ZbgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w5ZbgaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w5aCkKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5Eg8oLlEeqLl4tIPv2RCg" x="206" y="255"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5ZbgqavEeqJcvXkREZ1XQ" x="220" y="520"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O7MA0ILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O7MA0YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O7MA04LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w6CUs6avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w6CUtKavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6C7wKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O7MA0oLlEeqLl4tIPv2RCg" x="585" y="180"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w6CUtaavEeqJcvXkREZ1XQ" x="906" y="481"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O83b0ILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O83b0YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O83b04LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w6scAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w6scAaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6scA6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O83b0oLlEeqLl4tIPv2RCg" x="227" y="46"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w6scAqavEeqJcvXkREZ1XQ" x="240" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O9xawILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O9xawYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O9xaw4LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w7Ig4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w7Ig4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7Ig46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O9xawoLlEeqLl4tIPv2RCg" x="227" y="-54"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7Ig4qavEeqJcvXkREZ1XQ" x="240" y="100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O94vgILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O94vgYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O94vg4LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w7POkKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w7POkaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7POk6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O94vgoLlEeqLl4tIPv2RCg" x="227" y="-54"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7POkqavEeqJcvXkREZ1XQ" x="240" y="100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O-cwMILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O-cwMYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O-cwM4LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w7bb0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w7bb0aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7bb06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O-cwMoLlEeqLl4tIPv2RCg" x="639" y="-2"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7bb0qavEeqJcvXkREZ1XQ" x="840" y="-140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_O_5hsILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_O_5hsYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O_5hs4LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w7vk4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w7vk4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7vk46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7vk4qavEeqJcvXkREZ1XQ" x="840" y="-240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_w8ADkKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w8ADkaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8ADk6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O_5hsoLlEeqLl4tIPv2RCg" x="378" y="-306"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8ADkqavEeqJcvXkREZ1XQ" x="280" y="-320"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PBUeAILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_PBUeAYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PBVFEILlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w8cIcKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w8cIcaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8cIc6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PBUeAoLlEeqLl4tIPv2RCg" x="378" y="-406"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8cIcqavEeqJcvXkREZ1XQ" x="280" y="-420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PBdn8ILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_PBdn8YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PBdn84LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w8kEQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w8kEQaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8kEQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PBdn8oLlEeqLl4tIPv2RCg" x="378" y="-406"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8kEQqavEeqJcvXkREZ1XQ" x="280" y="-420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PBmK0ILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_PBmK0YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PBmK04LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w8qx8KavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w8qx8aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8qx86avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PBmK0oLlEeqLl4tIPv2RCg" x="378" y="-406"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8qx8qavEeqJcvXkREZ1XQ" x="280" y="-420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PCLZoILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_PCLZoYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PCLZo4LlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w81KAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w81KAaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w81KA6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PCLZooLlEeqLl4tIPv2RCg" x="1020" y="-80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w81KAqavEeqJcvXkREZ1XQ" x="1460" y="-320"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PEr7EILlEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_PEsiIILlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PEsiIoLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_w9kJ06avEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w9kJ1KavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w9kJ1qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PEsiIYLlEeqLl4tIPv2RCg" x="940" y="220"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_IWBQkIMaEeqLl4tIPv2RCg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IWBQkYMaEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IWB3oIMaEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IWBQkoMaEeqLl4tIPv2RCg" x="639" y="-102"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w9kJ1aavEeqJcvXkREZ1XQ" x="1020" y="140"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_l51YUer0EeaeHOJw3lCT8A" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_l51YUur0EeaeHOJw3lCT8A"/>
@@ -4938,32 +4930,38 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Fhqk_LAEeaAIfPpmDwI5Q"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6FhqlPLAEeaAIfPpmDwI5Q"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xaYCMIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_s9Rl4Or0EeaeHOJw3lCT8A">
+    <edges xmi:type="notation:Connector" xmi:id="_xaYCMIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_xaYpQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQYuREeiu6boZkiJHCA" x="-12"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yVhwAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQYuREeiu6boZkiJHCA" x="-40" y="79"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xaYpQouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQ4uREeiu6boZkiJHCA" x="-27"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yY-FkKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQ4uREeiu6boZkiJHCA" x="-69" y="36"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xaYpRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpRYuREeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ycsvAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpRYuREeiu6boZkiJHCA" x="36" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xaZQUIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQUYuREeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ygXHAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQUYuREeiu6boZkiJHCA" x="-36" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xaZQUouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQU4uREeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ykKo8KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQU4uREeiu6boZkiJHCA" x="24" y="-21"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xaZQVIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQVYuREeiu6boZkiJHCA" x="13" y="-16"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yoXzgKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQVYuREeiu6boZkiJHCA" x="-23" y="-16"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_xaYCMYuREeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xaYCMouREeiu6boZkiJHCA" points="[282, -117, -643984, -643984]$[193, 46, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yTgCkIuREeiu6boZkiJHCA" id="(0.14102564102564102,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yyd2gIuREeiu6boZkiJHCA" id="(0.718421052631579,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xaYCMouREeiu6boZkiJHCA" points="[320, -79, -643984, -643984]$[320, 200, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yTgCkIuREeiu6boZkiJHCA" id="(0.5985037406483791,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yyd2gIuREeiu6boZkiJHCA" id="(0.7368421052631579,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_zQcL8IuREeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_s9Rl4Or0EeaeHOJw3lCT8A">
+    <edges xmi:type="notation:Connector" xmi:id="_zQcL8IuREeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_zQcL84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0vcgkIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczAIuREeiu6boZkiJHCA" x="1" y="-18"/>
@@ -4990,18 +4988,18 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_zQcL8YuREeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zQcL8ouREeiu6boZkiJHCA" points="[167, 46, -643984, -643984]$[167, -1, -643984, -643984]$[50, -1, -643984, -643984]$[50, 46, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zQcL8ouREeiu6boZkiJHCA" points="[180, 200, -643984, -643984]$[180, 153, -643984, -643984]$[63, 153, -643984, -643984]$[63, 200, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0saasIuREeiu6boZkiJHCA" id="(0.5078947368421053,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0saasYuREeiu6boZkiJHCA" id="(0.0868421052631579,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_7buLUIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw">
+    <edges xmi:type="notation:Connector" xmi:id="_7buLUIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_7buyYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8bj3sIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyYYuREeiu6boZkiJHCA" x="-33" y="1"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyYYuREeiu6boZkiJHCA" x="-54" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_7buyYouREeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8eblgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyY4uREeiu6boZkiJHCA" x="-49"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyY4uREeiu6boZkiJHCA" x="-54" y="-14"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_7buyZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8g5qsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5021,14 +5019,14 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_7buLUYuREeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7buLUouREeiu6boZkiJHCA" points="[400, -117, -643984, -643984]$[399, 40, -643984, -643984]$[439, 40, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y1T0IuREeiu6boZkiJHCA" id="(0.7115384615384616,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y164IuREeiu6boZkiJHCA" id="(0.0,0.4077669902912621)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7buLUouREeiu6boZkiJHCA" points="[481, -213, -643984, -643984]$[767, -213, -643984, -643984]$[767, -140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y1T0IuREeiu6boZkiJHCA" id="(1.0,0.43983402489626555)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y164IuREeiu6boZkiJHCA" id="(0.2754880694143167,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__1Uo0IuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="__j6psOscEealN7CdLT_GPw">
+    <edges xmi:type="notation:Connector" xmi:id="__1Uo0IuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="__1VP4IuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A-448IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP4YuREeiu6boZkiJHCA" x="-50" y="6"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP4YuREeiu6boZkiJHCA" x="-50" y="15"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="__1VP4ouREeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BBuxkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5048,22 +5046,22 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="__1V28YuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BMoaAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1V28ouREeiu6boZkiJHCA" x="-17" y="-23"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1V28ouREeiu6boZkiJHCA" x="-24" y="-23"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="__1Uo0YuREeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__1Uo0ouREeiu6boZkiJHCA" points="[490, -220, -643984, -643984]$[1020, -220, -643984, -643984]$[1020, -80, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEIuSEeiu6boZkiJHCA" id="(1.0,0.455026455026455)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEYuSEeiu6boZkiJHCA" id="(0.5063291139240507,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__1Uo0ouREeiu6boZkiJHCA" points="[481, -260, -643984, -643984]$[1260, -260, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEIuSEeiu6boZkiJHCA" id="(1.0,0.24896265560165975)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEYuSEeiu6boZkiJHCA" id="(0.0,0.18691588785046728)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_DVHJcIuSEeiu6boZkiJHCA" type="Association_Edge" source="__j6psOscEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw">
+    <edges xmi:type="notation:Connector" xmi:id="_DVHJcIuSEeiu6boZkiJHCA" type="Association_Edge" source="__j6psOscEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_DVHwgIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FOZmUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwgYuSEeiu6boZkiJHCA" y="-19"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_DVHwgouSEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FSdm8IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwg4uSEeiu6boZkiJHCA" y="14"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwg4uSEeiu6boZkiJHCA" x="20" y="-17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_DVHwhIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FU_WgIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5075,7 +5073,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_DVHwiIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FaaCAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwiYuSEeiu6boZkiJHCA" x="16" y="19"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwiYuSEeiu6boZkiJHCA" x="22" y="-21"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_DVIXkIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fc7xkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5083,18 +5081,18 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_DVHJcYuSEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DVHJcouSEeiu6boZkiJHCA" points="[820, -40, -643984, -643984]$[580, -40, -643984, -643984]$[580, -2, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsIuSEeiu6boZkiJHCA" id="(0.0,0.19230769230769232)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsYuSEeiu6boZkiJHCA" id="(0.38950276243093923,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DVHJcouSEeiu6boZkiJHCA" points="[1260, -220, -643984, -643984]$[920, -220, -643984, -643984]$[920, -140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsIuSEeiu6boZkiJHCA" id="(0.0,0.3115264797507788)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsYuSEeiu6boZkiJHCA" id="(0.6073752711496746,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_J7u4IIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="__j6psOscEealN7CdLT_GPw">
+    <edges xmi:type="notation:Connector" xmi:id="_J7u4IIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_J7u4I4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LGCvIIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JIuSEeiu6boZkiJHCA" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_J7u4JYuSEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LIniAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JouSEeiu6boZkiJHCA" x="-27" y="-11"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JouSEeiu6boZkiJHCA" x="12" y="-17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_J7u4J4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LLhFAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5106,26 +5104,26 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_J7vfMouSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LRP5kIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfM4uSEeiu6boZkiJHCA" x="16" y="-14"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfM4uSEeiu6boZkiJHCA" x="14" y="29"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_J7vfNIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LVWWcIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfNYuSEeiu6boZkiJHCA" x="-17" y="-18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfNYuSEeiu6boZkiJHCA" x="-33" y="34"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_J7u4IYuSEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7u4IouSEeiu6boZkiJHCA" points="[722, 320, -643984, -643984]$[1040, 320, -643984, -643984]$[1040, 128, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LChhEIuSEeiu6boZkiJHCA" id="(1.0,0.8695652173913043)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCiIIIuSEeiu6boZkiJHCA" id="(0.5569620253164557,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7u4IouSEeiu6boZkiJHCA" points="[1111, 481, -643984, -643984]$[1111, 323, -643984, -643984]$[1480, 323, -643984, -643984]$[1480, 1, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LChhEIuSEeiu6boZkiJHCA" id="(0.7771317829457365,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCiIIIuSEeiu6boZkiJHCA" id="(0.36605657237936773,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_NFTRIIuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_ryFlIOr0EeaeHOJw3lCT8A">
+    <edges xmi:type="notation:Connector" xmi:id="_NFTRIIuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_ryFlIOr0EeaeHOJw3lCT8A" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_NFTRI4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OHDpEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MIuSEeiu6boZkiJHCA" x="25" y="10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MIuSEeiu6boZkiJHCA" x="-4" y="11"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_NFT4MYuSEeiu6boZkiJHCA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OJi8YIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MouSEeiu6boZkiJHCA" x="18" y="-10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MouSEeiu6boZkiJHCA" x="-61" y="-23"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_NFT4M4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OMbRQIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5145,68 +5143,80 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_NFTRIYuSEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NFTRIouSEeiu6boZkiJHCA" points="[199, 168, -643984, -643984]$[199, 219, -643984, -643984]$[385, 219, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwIuSEeiu6boZkiJHCA" id="(0.6657894736842105,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwYuSEeiu6boZkiJHCA" id="(0.0,0.2484472049689441)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NFTRIouSEeiu6boZkiJHCA" points="[322, 375, -643984, -643984]$[322, 461, -643984, -643984]$[619, 461, -643984, -643984]$[619, 601, -643984, -643984]$[706, 601, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwIuSEeiu6boZkiJHCA" id="(0.7421052631578947,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwYuSEeiu6boZkiJHCA" id="(0.0,0.4979253112033195)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_S68O0IuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_rR8FcOr0EeaeHOJw3lCT8A">
+    <edges xmi:type="notation:Connector" xmi:id="_S68O0IuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_rR8FcOr0EeaeHOJw3lCT8A" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_S6814IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xrdfUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_S6814YuSEeiu6boZkiJHCA" x="8" y="-2"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_S6814ouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xvY9EKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_S68144uSEeiu6boZkiJHCA" x="-11"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_S6815IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6815YuSEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xzTzwKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6815YuSEeiu6boZkiJHCA" x="5" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_S6815ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68154uSEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x3gXQKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68154uSEeiu6boZkiJHCA" x="-5" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_S6816IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6816YuSEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x7uI4KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6816YuSEeiu6boZkiJHCA" x="25" y="24"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_S6816ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68164uSEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yANnUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68164uSEeiu6boZkiJHCA" x="-21" y="26"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_S68O0YuSEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S68O0ouSEeiu6boZkiJHCA" points="[170, 168, -643984, -643984]$[160, 255, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaiZUIuSEeiu6boZkiJHCA" id="(0.19210526315789472,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UvwbYIuSEeiu6boZkiJHCA" id="(0.20426829268292682,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaiZUIuSEeiu6boZkiJHCA" id="(0.21052631578947367,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UvwbYIuSEeiu6boZkiJHCA" id="(0.19193857965451055,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Wx-KwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_QjgYUOsSEealN7CdLT_GPw">
+    <edges xmi:type="notation:Connector" xmi:id="_Wx-KwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v2L_wKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x0YuSEeiu6boZkiJHCA" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x04uSEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v6OLMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x04uSEeiu6boZkiJHCA" x="48" y="-84"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x1YuSEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v-UoEKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x1YuSEeiu6boZkiJHCA" x="24" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x14uSEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wCTwMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x14uSEeiu6boZkiJHCA" x="-24" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x2YuSEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wGWisKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x2YuSEeiu6boZkiJHCA" x="20" y="-24"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x24uSEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wKSngKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x24uSEeiu6boZkiJHCA" x="-23" y="-26"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Wx-KwYuSEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wx-KwouSEeiu6boZkiJHCA" points="[565, 184, -643984, -643984]$[578, 92, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gnApcHJqEeq3NYg-TXSAxQ" id="(0.5192878338278932,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YzgksIuSEeiu6boZkiJHCA" id="(0.3342541436464088,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wx-KwouSEeiu6boZkiJHCA" points="[756, 481, -643984, -643984]$[756, 241, -643984, -643984]$[760, 241, -643984, -643984]$[760, 1, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gnApcHJqEeq3NYg-TXSAxQ" id="(0.10465116279069768,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YzgksIuSEeiu6boZkiJHCA" id="(0.2603036876355748,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qz57QHJqEeq3NYg-TXSAxQ" type="Association_Edge" source="_QjgYUOsSEealN7CdLT_GPw" target="_LmxJ0HJqEeq3NYg-TXSAxQ">
+    <edges xmi:type="notation:Connector" xmi:id="_qz57QHJqEeq3NYg-TXSAxQ" type="Association_Edge" source="_QjgYUOsSEealN7CdLT_GPw" target="_LmxJ0HJqEeq3NYg-TXSAxQ" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_qz57Q3JqEeq3NYg-TXSAxQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S368IILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RHJqEeq3NYg-TXSAxQ" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RHJqEeq3NYg-TXSAxQ" x="15" y="-82"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_qz57RXJqEeq3NYg-TXSAxQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S-s5kILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RnJqEeq3NYg-TXSAxQ" x="6" y="-27"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RnJqEeq3NYg-TXSAxQ" x="-9" y="-108"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_qz57R3JqEeq3NYg-TXSAxQ" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TFMjIILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5222,143 +5232,143 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_qz57TXJqEeq3NYg-TXSAxQ" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TT5tgILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57TnJqEeq3NYg-TXSAxQ" x="-18" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57TnJqEeq3NYg-TXSAxQ" x="-18" y="24"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_qz57QXJqEeq3NYg-TXSAxQ"/>
       <element xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qz57QnJqEeq3NYg-TXSAxQ" points="[780, 101, -643984, -643984]$[780, 220, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkHJqEeq3NYg-TXSAxQ" id="(0.9419889502762431,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkXJqEeq3NYg-TXSAxQ" id="(0.10498687664041995,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qz57QnJqEeq3NYg-TXSAxQ" points="[980, -39, -643984, -643984]$[980, 140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkHJqEeq3NYg-TXSAxQ" id="(0.737527114967462,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkXJqEeq3NYg-TXSAxQ" id="(0.4199475065616798,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O5Eg9ILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_rR8FcOr0EeaeHOJw3lCT8A" target="_O5Eg8ILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O5Eg9YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O5Eg-YLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w5aCkaavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_rR8FcOr0EeaeHOJw3lCT8A" target="_w5ZbgKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w5aCkqavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w5aClqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O5Eg9oLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O5Eg94LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O5Eg-ILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w5aCk6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w5aClKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w5aClaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O7MA1ILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_O7MA0ILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O7MA1YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O7MA2YLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w6C7waavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_w6CUs6avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w6C7wqavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6C7xqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O7MA1oLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O7MA14LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O7MA2ILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w6C7w6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6C7xKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6C7xaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O83b1ILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_O83b0ILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O83b1YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O83b2YLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w6scBKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_w6scAKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w6scBaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6scCaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O83b1oLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O83b14LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O83b2ILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w6scBqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6scB6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6scCKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O9xaxILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_NFTRIIuSEeiu6boZkiJHCA" target="_O9xawILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O9xaxYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O9xayYLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w7Ig5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_NFTRIIuSEeiu6boZkiJHCA" target="_w7Ig4KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w7Ig5aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7Ig6aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O9xaxoLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O9xax4LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O9xayILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7Ig5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7Ig56avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7Ig6KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O94vhILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_S68O0IuSEeiu6boZkiJHCA" target="_O94vgILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O94vhYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O94viYLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w7POlKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_S68O0IuSEeiu6boZkiJHCA" target="_w7POkKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w7POlaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7POmaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O94vhoLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O94vh4LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O94viILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7POlqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7POl6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7POmKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O-cwNILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_QjgYUOsSEealN7CdLT_GPw" target="_O-cwMILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O-cwNYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O-cwOYLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w7bb1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QjgYUOsSEealN7CdLT_GPw" target="_w7bb0KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w7bb1aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7cC4KavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O-cwNoLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O-cwN4LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O-cwOILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7bb1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7bb16avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7bb2KavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O_5htILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_W4xb0OsTEealN7CdLT_GPw" target="_O_5hsILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_O_5htYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O_5huYLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w7vk5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qz57QHJqEeq3NYg-TXSAxQ" target="_w7vk4KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w7vk5aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7wL8qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7vk5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7wL8KavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7wL8aavEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_w8ADlKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_W4xb0OsTEealN7CdLT_GPw" target="_w8ADkKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w8ADlaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8AqoKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O_5htoLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O_5ht4LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O_5huILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8ADlqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8ADl6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8ADmKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_PBVFEYLlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_xaYCMIuREeiu6boZkiJHCA" target="_PBUeAILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_PBVFEoLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PBVFFoLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w8cIdKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xaYCMIuREeiu6boZkiJHCA" target="_w8cIcKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w8cIdaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8cIeaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBVFE4LlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBVFFILlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBVFFYLlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8cIdqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8cId6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8cIeKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_PBdn9ILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_7buLUIuREeiu6boZkiJHCA" target="_PBdn8ILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_PBdn9YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PBdn-YLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w8kERKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7buLUIuREeiu6boZkiJHCA" target="_w8kEQKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w8kERaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8kESaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBdn9oLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBdn94LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBdn-ILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8kERqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8kER6avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8kESKavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_PBmK1ILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="__1Uo0IuREeiu6boZkiJHCA" target="_PBmK0ILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_PBmK1YLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PBmK2YLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w8qx9KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__1Uo0IuREeiu6boZkiJHCA" target="_w8qx8KavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w8qx9aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8rZAqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBmK1oLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBmK14LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBmK2ILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8qx9qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8rZAKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8rZAaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_PCLZpILlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="__j6psOscEealN7CdLT_GPw" target="_PCLZoILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_PCLZpYLlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PCLZqYLlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w81KBKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__j6psOscEealN7CdLT_GPw" target="_w81KAKavEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w81KBaavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w81xEqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PCLZpoLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PCLZp4LlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PCLZqILlEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w81KBqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w81xEKavEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w81xEaavEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_PEsiI4LlEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_LmxJ0HJqEeq3NYg-TXSAxQ" target="_PEr7EILlEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_PEsiJILlEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PEsiKILlEeqLl4tIPv2RCg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_w9kw4KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_LmxJ0HJqEeq3NYg-TXSAxQ" target="_w9kJ06avEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_w9kw4aavEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w9kw5aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PEsiJYLlEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PEsiJoLlEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PEsiJ4LlEeqLl4tIPv2RCg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_IWB3oYMaEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_qz57QHJqEeq3NYg-TXSAxQ" target="_IWBQkIMaEeqLl4tIPv2RCg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_IWB3ooMaEeqLl4tIPv2RCg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IWB3poMaEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IWB3o4MaEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IWB3pIMaEeqLl4tIPv2RCg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IWB3pYMaEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w9kw4qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w9kw46avEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w9kw5KavEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_W_wkgPItEea79czpMf3AVQ" type="PapyrusUMLClassDiagram" name="DataTypes" measurementUnit="Pixel">
@@ -5628,8 +5638,5 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HXJksXh-EeqVN_GB3rPx7g" id="(0.6130268199233716,0.0)"/>
     </edges>
   </notation:Diagram>
-  <css:ModelStyleSheets xmi:id="_oSV1sIDJEeqLl4tIPv2RCg">
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_E4MvsIF2EeqLl4tIPv2RCg" path="/TAPI/UML/TapiClassDiagram.css"/>
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_E4MvsYF2EeqLl4tIPv2RCg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
-  </css:ModelStyleSheets>
+  <css:ModelStyleSheets xmi:id="_oSV1sIDJEeqLl4tIPv2RCg"/>
 </xmi:XMI>
diff --git a/UML/TapiConnectivity.uml b/UML/TapiConnectivity.uml
index f7eeba3a..73442880 100644
--- a/UML/TapiConnectivity.uml
+++ b/UML/TapiConnectivity.uml
@@ -937,7 +937,7 @@ All administrative controls of any aspect of protection are rejected.</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HRhzYHIZEeeSiaQ95-6r9w" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="__RAuEHJpEeq3NYg-TXSAxQ" name="ResilienceRoute">
+      <packagedElement xmi:type="uml:Class" xmi:id="__RAuEHJpEeq3NYg-TXSAxQ" name="ResilienceRoute" visibility="public">
         <ownedComment xmi:type="uml:Comment" xmi:id="__RAuEXJpEeq3NYg-TXSAxQ" annotatedElement="__RAuEHJpEeq3NYg-TXSAxQ">
           <body>This object adds resilience and state attributes to the Route.&#xD;
 When this object is not present, then the Route is intendend as &quot;current&quot; Route of the Connection.</body>
@@ -946,7 +946,7 @@ When this object is not present, then the Route is intendend as &quot;current&qu
           <ownedComment xmi:type="uml:Comment" xmi:id="__RAuE3JpEeq3NYg-TXSAxQ" annotatedElement="__RAuEnJpEeq3NYg-TXSAxQ">
             <body>Value of 0 (zero) means &quot;unspecified priority&quot;.&#xD;
 Highest priority is 1, sometimes referred as &quot;preferred&quot; or &quot;main&quot; or &quot;intended&quot; route.&#xD;
-Then 2 has lower priory than 1, 3 has lower priory than 2, etc.</body>
+2 has lower priority than 1, 3 has lower priority than 2, etc.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
           <defaultValue xmi:type="uml:LiteralInteger" xmi:id="__RAuFHJpEeq3NYg-TXSAxQ"/>
diff --git a/UML/TapiEquipment.notation b/UML/TapiEquipment.notation
index df3114e4..8b201d21 100644
--- a/UML/TapiEquipment.notation
+++ b/UML/TapiEquipment.notation
@@ -1,1558 +1,1558 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style">
   <notation:Diagram xmi:id="_hb9FIC8LEeexxefg2F1i1Q" type="PapyrusUMLClassDiagram" name="EquipmentPatternSkeleton" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_hb9s5C8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9s5S8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9s5i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_hb9s5C8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9s5S8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9s5i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9s5y8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9s5y8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hb9s6C8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9s6S8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9s6i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_hb9s6C8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9s6S8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9s6i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9s6y8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9s6y8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hb9tUS8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9tUi8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9tUy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_hb9tUS8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9tUi8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9tUy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9tVC8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9tVC8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hb9tVS8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9tVi8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9tVy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_hb9tVS8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9tVi8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9tVy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9tWC8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9tWC8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_kfYgcDmuEem1ZNpCEF2XWQ" type="Comment_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_kfYgcjmuEem1ZNpCEF2XWQ" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfYgcTmuEem1ZNpCEF2XWQ" x="-20" y="-260" width="281" height="21"/>
+    <children xsi:type="notation:Shape" xmi:id="_kfYgcDmuEem1ZNpCEF2XWQ" type="Comment_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_kfYgcjmuEem1ZNpCEF2XWQ" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kfYgcTmuEem1ZNpCEF2XWQ" x="-20" y="-260" width="281" height="21"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__vjDakv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDa0v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDbEv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDbUv0EemT5f_Ewhfs6A" y="15"/>
+    <children xsi:type="notation:Shape" xmi:id="__vjDakv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDa0v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDbEv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDbUv0EemT5f_Ewhfs6A" y="15"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vjDbkv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vjDb0v0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vjDcEv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vjDbkv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="__vjDb0v0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:id="__vjDcEv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="__vjDcUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDo0v0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vjDpEv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vjDpUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjDpkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjDp0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vjDqEv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vjDqUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vjDqkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjDq0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjDrEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vjDrUv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vjDrkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vjDr0v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjDsEv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjDsUv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjD5kv0EemT5f_Ewhfs6A" x="337" y="148" width="160"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__vjqd0v0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqeEv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqeUv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqekv0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vjqe0v0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="__vjqfEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqrkv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vjqr0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vjq4Uv0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vjq4kv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vjq40v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjq5Ev0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjq5Uv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vjq5kv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vjq50v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vjq6Ev0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjq6Uv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjq6kv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vjq60v0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vjq7Ev0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vjq7Uv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjq7kv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjq70v0EemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vkRikv0EemT5f_Ewhfs6A" x="533" y="-258" height="114"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__vk4gEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vk4gUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vk4gkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vk4g0v0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vk4hEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vk4hUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vk4hkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="__vjDcUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDo0v0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vjDpEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vjDpUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjDpkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjDp0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vjDqEv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vjDqUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vjDqkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjDq0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjDrEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vjDrUv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vjDrkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vjDr0v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjDsEv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjDsUv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjD5kv0EemT5f_Ewhfs6A" x="337" y="148" width="160"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__vjqd0v0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqeEv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqeUv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqekv0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vjqe0v0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="__vjqfEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqrkv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vjqr0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vjq4Uv0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vjq4kv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vjq40v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjq5Ev0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjq5Uv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vjq5kv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vjq50v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vjq6Ev0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjq6Uv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjq6kv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vjq60v0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vjq7Ev0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vjq7Uv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjq7kv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjq70v0EemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vkRikv0EemT5f_Ewhfs6A" x="533" y="-258" height="114"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__vk4gEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vk4gUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vk4gkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vk4g0v0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vk4hEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="__vk4hUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:id="__vk4hkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="__vk4h0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vk4uUv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vk4ukv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vk47Ev0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vk47Uv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vk47kv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vk470v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk48Ev0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vk48Uv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vk48kv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vk480v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vk49Ev0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk49Uv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vk49kv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vk490v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vk4-Ev0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vk4-Uv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk4-kv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk5L0v0EemT5f_Ewhfs6A" x="737" y="-152" width="150"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__vmGoEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vmGoUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vmGokv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vmGo0v0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vmGpEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="__vmGpUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmG10v0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vmG2Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmHCkv0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vmHC0v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vmHDEv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmHDUv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHDkv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vmHD0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vmHEEv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vmHEUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmHEkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHE0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vmHFEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vmHFUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vmHFkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmHF0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHGEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHTUv0EemT5f_Ewhfs6A" x="337" y="-152" width="160"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__vmtsEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vmtsUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vmtskv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vmts0v0EemT5f_Ewhfs6A" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vmttEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vmttUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vmttkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="__vk4h0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vk4uUv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vk4ukv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vk47Ev0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vk47Uv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vk47kv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vk470v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk48Ev0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vk48Uv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vk48kv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vk480v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vk49Ev0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk49Uv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vk49kv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vk490v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vk4-Ev0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vk4-Uv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk4-kv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk5L0v0EemT5f_Ewhfs6A" x="737" y="-152" width="150"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__vmGoEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vmGoUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vmGokv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vmGo0v0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vmGpEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="__vmGpUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmG10v0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vmG2Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmHCkv0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vmHC0v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vmHDEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmHDUv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHDkv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vmHD0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vmHEEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vmHEUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmHEkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHE0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vmHFEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vmHFUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vmHFkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmHF0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHGEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHTUv0EemT5f_Ewhfs6A" x="337" y="-152" width="160"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__vmtsEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vmtsUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vmtskv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vmts0v0EemT5f_Ewhfs6A" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vmttEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="__vmttUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:id="__vmttkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="__vmtt0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmt6Uv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vmt6kv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmuHEv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vmuHUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmuT0v0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vmuUEv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vmuUUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmuUkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmuU0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vmuVEv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vmuVUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vmuVkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmuV0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmuWEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vmuWUv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vmuWkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vmuW0v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmuXEv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmuXUv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmukkv0EemT5f_Ewhfs6A" x="-3" y="148" width="160"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__vn76kv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn760v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn77Ev0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn77Uv0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vn77kv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="__vn770v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vn8IUv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vn8Ikv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vn8VEv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vn8VUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vojD0v0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__vojEEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vojQkv0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vojQ0v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vojREv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vojRUv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojRkv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vojR0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vojSEv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vojSUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vojSkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojS0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vojTEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vojTUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vojTkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vojT0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojUEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojhUv0EemT5f_Ewhfs6A" x="737" y="86" width="160"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__vpxNEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxNUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxNkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxN0v0EemT5f_Ewhfs6A" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vpxOEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vpxOUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vpxOkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="__vmtt0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmt6Uv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vmt6kv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmuHEv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vmuHUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmuT0v0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vmuUEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vmuUUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmuUkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmuU0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vmuVEv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vmuVUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vmuVkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmuV0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmuWEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vmuWUv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vmuWkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vmuW0v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmuXEv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmuXUv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmukkv0EemT5f_Ewhfs6A" x="-3" y="148" width="160"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__vn76kv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn760v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn77Ev0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn77Uv0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vn77kv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="__vn770v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vn8IUv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vn8Ikv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vn8VEv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vn8VUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vojD0v0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__vojEEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vojQkv0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vojQ0v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vojREv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vojRUv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojRkv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vojR0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vojSEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vojSUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vojSkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojS0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vojTEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vojTUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vojTkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vojT0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojUEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojhUv0EemT5f_Ewhfs6A" x="737" y="86" width="160"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__vpxNEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxNUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxNkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxN0v0EemT5f_Ewhfs6A" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vpxOEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="__vpxOUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:id="__vpxOkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="__vpxO0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxbUv0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpxO0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxbUv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__vpxbkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxoEv0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpxbkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxoEv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__vpxoUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpx00v0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpxoUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpx00v0EemT5f_Ewhfs6A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__vpx1Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpyBkv0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpx1Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpyBkv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__vpyB0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpyMkv0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpyB0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpyMkv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__vpyM0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpyZUv0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpyM0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpyZUv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__vpyZkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpymEv0EemT5f_Ewhfs6A"/>
+        <children xsi:type="notation:Shape" xmi:id="__vpyZkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpymEv0EemT5f_Ewhfs6A"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vpymUv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vpymkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vpym0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpynEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vpymUv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vpymkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vpym0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpynEv0EemT5f_Ewhfs6A"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vpynUv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vpynkv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vpyn0v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vpyoEv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpyoUv0EemT5f_Ewhfs6A"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vpynUv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vpynkv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vpyn0v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vpyoEv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpyoUv0EemT5f_Ewhfs6A"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__vpyokv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__vpyo0v0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__vpypEv0EemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__vpypUv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpypkv0EemT5f_Ewhfs6A"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__vpyokv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__vpyo0v0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__vpypEv0EemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__vpypUv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpypkv0EemT5f_Ewhfs6A"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpy20v0EemT5f_Ewhfs6A" x="-3" y="-72" width="160"/>
+      <element href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpy20v0EemT5f_Ewhfs6A" x="-3" y="-72" width="160"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_FoNqYEv2EemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_FoORcEv2EemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FoORcUv2EemT5f_Ewhfs6A" x="-4" y="-205" width="281" height="8"/>
+    <children xsi:type="notation:Shape" xmi:id="_FoNqYEv2EemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_FoORcEv2EemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_FoORcUv2EemT5f_Ewhfs6A" x="-4" y="-205" width="281" height="8"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_iEA1sFolEemu443YKSGnxQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_iEA1slolEemu443YKSGnxQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iEA1s1olEemu443YKSGnxQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iEA1tFolEemu443YKSGnxQ" y="15"/>
+    <children xsi:type="notation:Shape" xmi:id="_iEA1sFolEemu443YKSGnxQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_iEA1slolEemu443YKSGnxQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iEA1s1olEemu443YKSGnxQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iEA1tFolEemu443YKSGnxQ" y="15"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_iEA1tVolEemu443YKSGnxQ" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_iEA1tlolEemu443YKSGnxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_iEA1t1olEemu443YKSGnxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iEA1uFolEemu443YKSGnxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1uVolEemu443YKSGnxQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_iEA1tVolEemu443YKSGnxQ" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_iEA1tlolEemu443YKSGnxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_iEA1t1olEemu443YKSGnxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_iEA1uFolEemu443YKSGnxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1uVolEemu443YKSGnxQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_iEA1ulolEemu443YKSGnxQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_iEA1u1olEemu443YKSGnxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_iEA1vFolEemu443YKSGnxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iEA1vVolEemu443YKSGnxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1vlolEemu443YKSGnxQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_iEA1ulolEemu443YKSGnxQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_iEA1u1olEemu443YKSGnxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_iEA1vFolEemu443YKSGnxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_iEA1vVolEemu443YKSGnxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1vlolEemu443YKSGnxQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_iEA1v1olEemu443YKSGnxQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_iEA1wFolEemu443YKSGnxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_iEA1wVolEemu443YKSGnxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iEA1wlolEemu443YKSGnxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1w1olEemu443YKSGnxQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_iEA1v1olEemu443YKSGnxQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_iEA1wFolEemu443YKSGnxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_iEA1wVolEemu443YKSGnxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_iEA1wlolEemu443YKSGnxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1w1olEemu443YKSGnxQ"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1sVolEemu443YKSGnxQ" x="857" y="-266" height="79"/>
+      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1sVolEemu443YKSGnxQ" x="857" y="-266" height="79"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XqjNgB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XqjNgR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XqjNgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XqjNgB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XqjNgR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XqjNgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XqjNgh0zEeqCFrodiWelgQ" x="537" y="148"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XqjNgh0zEeqCFrodiWelgQ" x="537" y="148"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XrQYIB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XrQYIR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrQYIx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_XrQYIB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XrQYIR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrQYIx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XrQYIh0zEeqCFrodiWelgQ" x="733" y="-258"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XrQYIh0zEeqCFrodiWelgQ" x="733" y="-258"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xrqn0B0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xrqn0R0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xrqn0x0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xrqn0B0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xrqn0R0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xrqn0x0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xrqn0h0zEeqCFrodiWelgQ" x="733" y="-358"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xrqn0h0zEeqCFrodiWelgQ" x="733" y="-358"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XrzKsB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XrzKsR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrzKsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_XrzKsB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XrzKsR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrzKsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XrzKsh0zEeqCFrodiWelgQ" x="733" y="-358"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XrzKsh0zEeqCFrodiWelgQ" x="733" y="-358"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xr4qQB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xr4qQR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xr4qQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xr4qQB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xr4qQR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xr4qQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xr4qQh0zEeqCFrodiWelgQ" x="733" y="-358"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xr4qQh0zEeqCFrodiWelgQ" x="733" y="-358"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XsaOsB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XsaOsR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XsaOsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <children xsi:type="notation:Shape" xmi:id="_XsaOsB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XsaOsR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XsaOsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsaOsh0zEeqCFrodiWelgQ" x="937" y="-152"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XsaOsh0zEeqCFrodiWelgQ" x="937" y="-152"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XszQQB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XszQQR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XszQQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <children xsi:type="notation:Shape" xmi:id="_XszQQB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XszQQR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XszQQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XszQQh0zEeqCFrodiWelgQ" x="937" y="-252"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XszQQh0zEeqCFrodiWelgQ" x="937" y="-252"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xs7MEB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xs7MER0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xs7MEx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xs7MEB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xs7MER0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xs7MEx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xs7MEh0zEeqCFrodiWelgQ" x="937" y="-252"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xs7MEh0zEeqCFrodiWelgQ" x="937" y="-252"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XtmhgB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XtmhgR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xtmhgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_XtmhgB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XtmhgR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xtmhgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xtmhgh0zEeqCFrodiWelgQ" x="537" y="-152"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xtmhgh0zEeqCFrodiWelgQ" x="537" y="-152"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xt74sB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xt74sR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xt74sx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xt74sB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xt74sR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xt74sx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xt74sh0zEeqCFrodiWelgQ" x="537" y="-252"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xt74sh0zEeqCFrodiWelgQ" x="537" y="-252"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XuFpsB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XuFpsR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuFpsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_XuFpsB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XuFpsR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuFpsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XuFpsh0zEeqCFrodiWelgQ" x="537" y="-252"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XuFpsh0zEeqCFrodiWelgQ" x="537" y="-252"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XuocQB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XuocQR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuocQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XuocQB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XuocQR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuocQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XuocQh0zEeqCFrodiWelgQ" x="197" y="148"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XuocQh0zEeqCFrodiWelgQ" x="197" y="148"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xu7XMB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xu7XMR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xu7XMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xu7XMB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xu7XMR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xu7XMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xu7XMh0zEeqCFrodiWelgQ" x="197" y="48"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xu7XMh0zEeqCFrodiWelgQ" x="197" y="48"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XvibMB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XvibMR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XvibMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_XvibMB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XvibMR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XvibMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XvibMh0zEeqCFrodiWelgQ" x="937" y="86"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XvibMh0zEeqCFrodiWelgQ" x="937" y="86"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xv4ZcB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xv4ZcR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv4Zcx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xv4ZcB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xv4ZcR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv4Zcx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xv4Zch0zEeqCFrodiWelgQ" x="937" y="-14"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xv4Zch0zEeqCFrodiWelgQ" x="937" y="-14"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xv95AB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xv95AR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv-gEB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xv95AB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xv95AR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv-gEB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xv95Ah0zEeqCFrodiWelgQ" x="937" y="-14"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xv95Ah0zEeqCFrodiWelgQ" x="937" y="-14"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XwgrkB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XwgrkR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xwgrkx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XwgrkB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XwgrkR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xwgrkx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xwgrkh0zEeqCFrodiWelgQ" x="197" y="-72"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xwgrkh0zEeqCFrodiWelgQ" x="197" y="-72"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xw00oB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xw00oR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xw00ox0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xw00oB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xw00oR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xw00ox0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xw00oh0zEeqCFrodiWelgQ" x="197" y="-172"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xw00oh0zEeqCFrodiWelgQ" x="197" y="-172"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XxZcYB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XxZcYR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XxaDcB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XxZcYB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XxZcYR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxaDcB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XxZcYh0zEeqCFrodiWelgQ" x="1057" y="-266"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XxZcYh0zEeqCFrodiWelgQ" x="1057" y="-266"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_hb9t2i8LEeexxefg2F1i1Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_hb9t2y8LEeexxefg2F1i1Q"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_p-B3QB7PEemtpZa4_mUYIA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_hb9t2i8LEeexxefg2F1i1Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_hb9t2y8LEeexxefg2F1i1Q"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_p-B3QB7PEemtpZa4_mUYIA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_hb9t7y8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s5C8LEeexxefg2F1i1Q">
-      <styles xmi:type="notation:FontStyle" xmi:id="_hb9t8C8LEeexxefg2F1i1Q"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9t8S8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hb9t8i8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t8y8LEeexxefg2F1i1Q"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t9C8LEeexxefg2F1i1Q"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_hb9t9S8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s6C8LEeexxefg2F1i1Q">
-      <styles xmi:type="notation:FontStyle" xmi:id="_hb9t9i8LEeexxefg2F1i1Q"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9t9y8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hb9t-C8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t-S8LEeexxefg2F1i1Q"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t-i8LEeexxefg2F1i1Q"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_hb9uli8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9tUS8LEeexxefg2F1i1Q">
-      <styles xmi:type="notation:FontStyle" xmi:id="_hb9uly8LEeexxefg2F1i1Q"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9umC8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hb9umS8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9umi8LEeexxefg2F1i1Q"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9umy8LEeexxefg2F1i1Q"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vicQEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vicQUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicQkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicQ0v0EemT5f_Ewhfs6A" x="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vicREv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicRUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicRkv0EemT5f_Ewhfs6A" x="3" y="2"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vicR0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicSEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicSUv0EemT5f_Ewhfs6A" x="15" y="-82"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vicSkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicS0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicTEv0EemT5f_Ewhfs6A" x="-17" y="-40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vicTUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicTkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicT0v0EemT5f_Ewhfs6A" x="15" y="-14"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vicUEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicUUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicUkv0EemT5f_Ewhfs6A" x="-20" y="-15"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vicU0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vicV0v0EemT5f_Ewhfs6A" points="[737, 166, -643984, -643984]$[657, 166, -643984, -643984]$[657, 106, -643984, -643984]$[737, 106, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vicWEv0EemT5f_Ewhfs6A" id="(0.0,0.8)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vicWUv0EemT5f_Ewhfs6A" id="(0.0,0.2)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vjDUEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDUUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDUkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDU0v0EemT5f_Ewhfs6A" x="21" y="-7"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDVEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDVUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDVkv0EemT5f_Ewhfs6A" x="4" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDV0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDWEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDWUv0EemT5f_Ewhfs6A" x="72" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDWkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDW0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDXEv0EemT5f_Ewhfs6A" x="-32" y="60"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDXUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDXkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDX0v0EemT5f_Ewhfs6A" x="15" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjDYEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDYUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDYkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vjDY0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vjDZ0v0EemT5f_Ewhfs6A" points="[357, -112, -643984, -643984]$[137, -112, -643984, -643984]$[137, -72, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjDaEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjDaUv0EemT5f_Ewhfs6A" id="(0.625,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vjqYEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqYUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqYkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqY0v0EemT5f_Ewhfs6A" y="-7"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqZEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqZUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqZkv0EemT5f_Ewhfs6A" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqZ0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqaEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqaUv0EemT5f_Ewhfs6A" x="68" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqakv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqa0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqbEv0EemT5f_Ewhfs6A" x="-68" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqbUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqbkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqb0v0EemT5f_Ewhfs6A" x="14" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vjqcEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqcUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqckv0EemT5f_Ewhfs6A" x="-15" y="25"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vjqc0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vjqdEv0EemT5f_Ewhfs6A" points="[877, 186, -643984, -643984]$[877, 246, -643984, -643984]$[757, 246, -643984, -643984]$[757, 186, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjqdUv0EemT5f_Ewhfs6A" id="(0.875,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjqdkv0EemT5f_Ewhfs6A" id="(0.125,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vlfkEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfkUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfkkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfk0v0EemT5f_Ewhfs6A" x="32" y="-5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlflEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlflUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlflkv0EemT5f_Ewhfs6A" x="7"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfl0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfmEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfmUv0EemT5f_Ewhfs6A" x="2" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfmkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfm0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfnEv0EemT5f_Ewhfs6A" x="-2" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfnUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfnkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfn0v0EemT5f_Ewhfs6A" x="17" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfoEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfoUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfokv0EemT5f_Ewhfs6A" x="-26" y="20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vlfo0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vlfp0v0EemT5f_Ewhfs6A" points="[757, -112, -643984, -643984]$[577, -112, -643984, -643984]$[577, 208, -643984, -643984]$[457, 208, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfqEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfqUv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vlfqkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmtsEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfq0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfrEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfrUv0EemT5f_Ewhfs6A" x="13" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfrkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfr0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfsEv0EemT5f_Ewhfs6A" x="33" y="4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfsUv0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vlfskv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vlfs0v0EemT5f_Ewhfs6A" key="visible" value="true"/>
+    <element href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_hb9t7y8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s5C8LEeexxefg2F1i1Q">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hb9t8C8LEeexxefg2F1i1Q"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9t8S8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hb9t8i8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t8y8LEeexxefg2F1i1Q"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t9C8LEeexxefg2F1i1Q"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_hb9t9S8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s6C8LEeexxefg2F1i1Q">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hb9t9i8LEeexxefg2F1i1Q"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9t9y8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hb9t-C8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t-S8LEeexxefg2F1i1Q"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t-i8LEeexxefg2F1i1Q"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_hb9uli8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9tUS8LEeexxefg2F1i1Q">
+      <styles xsi:type="notation:FontStyle" xmi:id="_hb9uly8LEeexxefg2F1i1Q"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9umC8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hb9umS8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9umi8LEeexxefg2F1i1Q"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9umy8LEeexxefg2F1i1Q"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vicQEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vicQUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicQkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicQ0v0EemT5f_Ewhfs6A" x="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vicREv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicRUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicRkv0EemT5f_Ewhfs6A" x="3" y="2"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vicR0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicSEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicSUv0EemT5f_Ewhfs6A" x="15" y="-82"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vicSkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicS0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicTEv0EemT5f_Ewhfs6A" x="-17" y="-40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vicTUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicTkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicT0v0EemT5f_Ewhfs6A" x="15" y="-14"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vicUEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicUUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicUkv0EemT5f_Ewhfs6A" x="-20" y="-15"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vicU0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vicV0v0EemT5f_Ewhfs6A" points="[737, 166, -643984, -643984]$[657, 166, -643984, -643984]$[657, 106, -643984, -643984]$[737, 106, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vicWEv0EemT5f_Ewhfs6A" id="(0.0,0.8)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vicWUv0EemT5f_Ewhfs6A" id="(0.0,0.2)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vjDUEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDUUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDUkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDU0v0EemT5f_Ewhfs6A" x="21" y="-7"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDVEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDVUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDVkv0EemT5f_Ewhfs6A" x="4" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDV0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDWEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDWUv0EemT5f_Ewhfs6A" x="72" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDWkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDW0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDXEv0EemT5f_Ewhfs6A" x="-32" y="60"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDXUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDXkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDX0v0EemT5f_Ewhfs6A" x="15" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjDYEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDYUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDYkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vjDY0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vjDZ0v0EemT5f_Ewhfs6A" points="[357, -112, -643984, -643984]$[137, -112, -643984, -643984]$[137, -72, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjDaEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjDaUv0EemT5f_Ewhfs6A" id="(0.625,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vjqYEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqYUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqYkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqY0v0EemT5f_Ewhfs6A" y="-7"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqZEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqZUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqZkv0EemT5f_Ewhfs6A" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqZ0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqaEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqaUv0EemT5f_Ewhfs6A" x="68" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqakv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqa0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqbEv0EemT5f_Ewhfs6A" x="-68" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqbUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqbkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqb0v0EemT5f_Ewhfs6A" x="14" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vjqcEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqcUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqckv0EemT5f_Ewhfs6A" x="-15" y="25"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vjqc0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vjqdEv0EemT5f_Ewhfs6A" points="[877, 186, -643984, -643984]$[877, 246, -643984, -643984]$[757, 246, -643984, -643984]$[757, 186, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjqdUv0EemT5f_Ewhfs6A" id="(0.875,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjqdkv0EemT5f_Ewhfs6A" id="(0.125,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vlfkEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfkUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfkkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfk0v0EemT5f_Ewhfs6A" x="32" y="-5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlflEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlflUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlflkv0EemT5f_Ewhfs6A" x="7"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfl0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfmEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfmUv0EemT5f_Ewhfs6A" x="2" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfmkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfm0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfnEv0EemT5f_Ewhfs6A" x="-2" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfnUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfnkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfn0v0EemT5f_Ewhfs6A" x="17" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfoEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfoUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfokv0EemT5f_Ewhfs6A" x="-26" y="20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vlfo0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vlfp0v0EemT5f_Ewhfs6A" points="[757, -112, -643984, -643984]$[577, -112, -643984, -643984]$[577, 208, -643984, -643984]$[457, 208, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfqEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfqUv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vlfqkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmtsEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfq0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfrEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfrUv0EemT5f_Ewhfs6A" x="13" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfrkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfr0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfsEv0EemT5f_Ewhfs6A" x="33" y="4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfsUv0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:id="__vlfskv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:id="__vlfs0v0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlftEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlftUv0EemT5f_Ewhfs6A" x="73" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlftkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlft0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfuEv0EemT5f_Ewhfs6A" x="-53" y="15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfuUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfukv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfu0v0EemT5f_Ewhfs6A" x="15" y="14"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfvEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfvUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfvkv0EemT5f_Ewhfs6A" x="-26" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vlfv0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vlfw0v0EemT5f_Ewhfs6A" points="[152, 208, -643984, -643984]$[232, 208, -643984, -643984]$[232, -32, -643984, -643984]$[141, -32, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfxEv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfxUv0EemT5f_Ewhfs6A" id="(1.0,0.4)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vlfxkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vmGoEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfx0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfyEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfyUv0EemT5f_Ewhfs6A" x="-1" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfykv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfy0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfzEv0EemT5f_Ewhfs6A" x="-14" y="10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlfzUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfzkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfz0v0EemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlf0Ev0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlf0Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlf0kv0EemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlf00v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlf1Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlf1Uv0EemT5f_Ewhfs6A" x="9" y="-16"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vlf1kv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlf10v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlf2Ev0EemT5f_Ewhfs6A" x="-13" y="-12"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vlf2Uv0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vlf3Uv0EemT5f_Ewhfs6A" points="[533, -227, -643984, -643984]$[398, -227, -643984, -643984]$[398, -152, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlf3kv0EemT5f_Ewhfs6A" id="(0.0,0.2719298245614035)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlf30v0EemT5f_Ewhfs6A" id="(0.375,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vn70Ev0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vk4gEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn70Uv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn70kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn700v0EemT5f_Ewhfs6A" x="-13" y="8"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn71Ev0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn71Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn71kv0EemT5f_Ewhfs6A" x="-22" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn710v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn72Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn72Uv0EemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn72kv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn720v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn73Ev0EemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn73Uv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn73kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn730v0EemT5f_Ewhfs6A" x="5" y="12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vn74Ev0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn74Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn74kv0EemT5f_Ewhfs6A" x="-7" y="18"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vn740v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vn750v0EemT5f_Ewhfs6A" points="[649, -187, -643984, -643984]$[829, -187, -643984, -643984]$[829, -152, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vn76Ev0EemT5f_Ewhfs6A" id="(1.0,0.6228070175438597)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vn76Uv0EemT5f_Ewhfs6A" id="(0.62,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vpxAEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vpxNEv0EemT5f_Ewhfs6A" target="__vmtsEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxAUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxAkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxA0v0EemT5f_Ewhfs6A" x="-13" y="-5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxBEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxBUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxBkv0EemT5f_Ewhfs6A" x="-33" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxB0v0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxCEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxCUv0EemT5f_Ewhfs6A" x="19" y="-46"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxCkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxC0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxDEv0EemT5f_Ewhfs6A" x="-16" y="65"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxDUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxDkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxD0v0EemT5f_Ewhfs6A" x="13" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxEEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxEUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxEkv0EemT5f_Ewhfs6A" x="-18" y="-12"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vpxE0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vpxF0v0EemT5f_Ewhfs6A" points="[77, 28, -643984, -643984]$[77, 148, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxGEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxGUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vpxGkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxG0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxHEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxHUv0EemT5f_Ewhfs6A" x="-3" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxHkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxH0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxIEv0EemT5f_Ewhfs6A" x="-22" y="9"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxIUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxIkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxI0v0EemT5f_Ewhfs6A" x="21" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxJEv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxJUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxJkv0EemT5f_Ewhfs6A" x="-21" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxJ0v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxKEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxKUv0EemT5f_Ewhfs6A" x="7" y="15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vpxKkv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxK0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxLEv0EemT5f_Ewhfs6A" x="-22" y="-17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vpxLUv0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vpxMUv0EemT5f_Ewhfs6A" points="[787, -52, -643984, -643984]$[787, 28, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxMkv0EemT5f_Ewhfs6A" id="(0.5266666666666666,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxM0v0EemT5f_Ewhfs6A" id="(0.49375,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__vrmMEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__vrmMUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmMkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmM0v0EemT5f_Ewhfs6A" x="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vrmNEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmNUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmNkv0EemT5f_Ewhfs6A" x="7" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vrmN0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmOEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmOUv0EemT5f_Ewhfs6A" x="75" y="-20"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlftEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlftUv0EemT5f_Ewhfs6A" x="73" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlftkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlft0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfuEv0EemT5f_Ewhfs6A" x="-53" y="15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfuUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfukv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfu0v0EemT5f_Ewhfs6A" x="15" y="14"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfvEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfvUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfvkv0EemT5f_Ewhfs6A" x="-26" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vlfv0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vlfw0v0EemT5f_Ewhfs6A" points="[152, 208, -643984, -643984]$[232, 208, -643984, -643984]$[232, -32, -643984, -643984]$[141, -32, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfxEv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfxUv0EemT5f_Ewhfs6A" id="(1.0,0.4)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vlfxkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vmGoEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfx0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfyEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfyUv0EemT5f_Ewhfs6A" x="-1" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfykv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfy0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfzEv0EemT5f_Ewhfs6A" x="-14" y="10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlfzUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfzkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfz0v0EemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlf0Ev0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlf0Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlf0kv0EemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlf00v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlf1Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlf1Uv0EemT5f_Ewhfs6A" x="9" y="-16"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vlf1kv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlf10v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlf2Ev0EemT5f_Ewhfs6A" x="-13" y="-12"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vlf2Uv0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vlf3Uv0EemT5f_Ewhfs6A" points="[533, -227, -643984, -643984]$[398, -227, -643984, -643984]$[398, -152, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlf3kv0EemT5f_Ewhfs6A" id="(0.0,0.2719298245614035)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlf30v0EemT5f_Ewhfs6A" id="(0.375,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vn70Ev0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vk4gEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn70Uv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn70kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn700v0EemT5f_Ewhfs6A" x="-13" y="8"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn71Ev0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn71Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn71kv0EemT5f_Ewhfs6A" x="-22" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn710v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn72Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn72Uv0EemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn72kv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn720v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn73Ev0EemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn73Uv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn73kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn730v0EemT5f_Ewhfs6A" x="5" y="12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vn74Ev0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn74Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn74kv0EemT5f_Ewhfs6A" x="-7" y="18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vn740v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vn750v0EemT5f_Ewhfs6A" points="[649, -187, -643984, -643984]$[829, -187, -643984, -643984]$[829, -152, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vn76Ev0EemT5f_Ewhfs6A" id="(1.0,0.6228070175438597)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vn76Uv0EemT5f_Ewhfs6A" id="(0.62,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vpxAEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vpxNEv0EemT5f_Ewhfs6A" target="__vmtsEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxAUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxAkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxA0v0EemT5f_Ewhfs6A" x="-13" y="-5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxBEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxBUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxBkv0EemT5f_Ewhfs6A" x="-33" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxB0v0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxCEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxCUv0EemT5f_Ewhfs6A" x="19" y="-46"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxCkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxC0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxDEv0EemT5f_Ewhfs6A" x="-16" y="65"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxDUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxDkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxD0v0EemT5f_Ewhfs6A" x="13" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxEEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxEUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxEkv0EemT5f_Ewhfs6A" x="-18" y="-12"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vpxE0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vpxF0v0EemT5f_Ewhfs6A" points="[77, 28, -643984, -643984]$[77, 148, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxGEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxGUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vpxGkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxG0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxHEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxHUv0EemT5f_Ewhfs6A" x="-3" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxHkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxH0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxIEv0EemT5f_Ewhfs6A" x="-22" y="9"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxIUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxIkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxI0v0EemT5f_Ewhfs6A" x="21" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxJEv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxJUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxJkv0EemT5f_Ewhfs6A" x="-21" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxJ0v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxKEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxKUv0EemT5f_Ewhfs6A" x="7" y="15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vpxKkv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxK0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxLEv0EemT5f_Ewhfs6A" x="-22" y="-17"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vpxLUv0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vpxMUv0EemT5f_Ewhfs6A" points="[787, -52, -643984, -643984]$[787, 28, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxMkv0EemT5f_Ewhfs6A" id="(0.5266666666666666,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxM0v0EemT5f_Ewhfs6A" id="(0.49375,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__vrmMEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__vrmMUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmMkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmM0v0EemT5f_Ewhfs6A" x="27"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vrmNEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmNUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmNkv0EemT5f_Ewhfs6A" x="7" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vrmN0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmOEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmOUv0EemT5f_Ewhfs6A" x="75" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vrmOkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmO0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmPEv0EemT5f_Ewhfs6A" x="-75" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vrmOkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmO0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmPEv0EemT5f_Ewhfs6A" x="-75" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vrmPUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmPkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmP0v0EemT5f_Ewhfs6A" x="7" y="15"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vrmPUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmPkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmP0v0EemT5f_Ewhfs6A" x="7" y="15"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__vrmQEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmQUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmQkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__vrmQEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmQUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmQkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__vrmQ0v0EemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vrmR0v0EemT5f_Ewhfs6A" points="[417, -52, -643984, -643984]$[417, 148, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vrmSEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vrmSUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="__vrmQ0v0EemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vrmR0v0EemT5f_Ewhfs6A" points="[417, -52, -643984, -643984]$[417, 148, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vrmSEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vrmSUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_iQgZkFolEemu443YKSGnxQ" type="Dependency_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="_iEA1sFolEemu443YKSGnxQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_iQgZk1olEemu443YKSGnxQ" type="Dependency_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jIJzQFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iQgZlFolEemu443YKSGnxQ" x="-10" y="-13"/>
+    <edges xsi:type="notation:Connector" xmi:id="_iQgZkFolEemu443YKSGnxQ" type="Dependency_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="_iEA1sFolEemu443YKSGnxQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_iQgZk1olEemu443YKSGnxQ" type="Dependency_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jIJzQFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iQgZlFolEemu443YKSGnxQ" x="-10" y="-13"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iQgZlVolEemu443YKSGnxQ" type="Dependency_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jPl4AFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iQgZllolEemu443YKSGnxQ" x="-1" y="8"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iQgZlVolEemu443YKSGnxQ" type="Dependency_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jPl4AFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iQgZllolEemu443YKSGnxQ" x="-1" y="8"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_iQgZkVolEemu443YKSGnxQ"/>
-      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iQgZklolEemu443YKSGnxQ" points="[533, -188, -643984, -643984]$[0, 0, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jXxjoFolEemu443YKSGnxQ" id="(1.0,0.21929824561403508)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jXxjoVolEemu443YKSGnxQ" id="(0.0,0.4177215189873418)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_iQgZkVolEemu443YKSGnxQ"/>
+      <element href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_iQgZklolEemu443YKSGnxQ" points="[533, -188, -643984, -643984]$[0, 0, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jXxjoFolEemu443YKSGnxQ" id="(1.0,0.21929824561403508)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jXxjoVolEemu443YKSGnxQ" id="(0.0,0.4177215189873418)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XqjNhB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDakv0EemT5f_Ewhfs6A" target="_XqjNgB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XqjNhR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XqjNiR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XqjNhB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDakv0EemT5f_Ewhfs6A" target="_XqjNgB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XqjNhR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XqjNiR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XqjNhh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XqjNhx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XqjNiB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XqjNhh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XqjNhx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XqjNiB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XrQYJB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqd0v0EemT5f_Ewhfs6A" target="_XrQYIB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XrQYJR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrQYKR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XrQYJB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqd0v0EemT5f_Ewhfs6A" target="_XrQYIB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XrQYJR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrQYKR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XrQYJh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrQYJx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrQYKB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XrQYJh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrQYJx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrQYKB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xrqn1B0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfxkv0EemT5f_Ewhfs6A" target="_Xrqn0B0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xrqn1R0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xrqn2R0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xrqn1B0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfxkv0EemT5f_Ewhfs6A" target="_Xrqn0B0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xrqn1R0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xrqn2R0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xrqn1h0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xrqn1x0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xrqn2B0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xrqn1h0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xrqn1x0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xrqn2B0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XrzKtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn70Ev0EemT5f_Ewhfs6A" target="_XrzKsB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XrzKtR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrzKuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XrzKtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn70Ev0EemT5f_Ewhfs6A" target="_XrzKsB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XrzKtR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrzKuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XrzKth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrzKtx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrzKuB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XrzKth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrzKtx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrzKuB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xr4qRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iQgZkFolEemu443YKSGnxQ" target="_Xr4qQB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xr4qRR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xr4qSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xr4qRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iQgZkFolEemu443YKSGnxQ" target="_Xr4qQB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xr4qRR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xr4qSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xr4qRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xr4qRx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xr4qSB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xr4qRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xr4qRx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xr4qSB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XsaOtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vk4gEv0EemT5f_Ewhfs6A" target="_XsaOsB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XsaOtR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XsaOuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XsaOtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vk4gEv0EemT5f_Ewhfs6A" target="_XsaOsB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XsaOtR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XsaOuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XsaOth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XsaOtx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XsaOuB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XsaOth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XsaOtx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XsaOuB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XszQRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfkEv0EemT5f_Ewhfs6A" target="_XszQQB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XszQRR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XszQSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XszQRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfkEv0EemT5f_Ewhfs6A" target="_XszQQB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XszQRR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XszQSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XszQRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XszQRx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XszQSB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XszQRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XszQRx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XszQSB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xs7MFB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxGkv0EemT5f_Ewhfs6A" target="_Xs7MEB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xs7MFR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xs7MGR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xs7MFB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxGkv0EemT5f_Ewhfs6A" target="_Xs7MEB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xs7MFR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xs7MGR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xs7MFh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xs7MFx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xs7MGB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xs7MFh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xs7MFx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xs7MGB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XtnIkB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmGoEv0EemT5f_Ewhfs6A" target="_XtmhgB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XtnIkR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XtnIlR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XtnIkB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmGoEv0EemT5f_Ewhfs6A" target="_XtmhgB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XtnIkR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XtnIlR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XtnIkh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtnIkx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtnIlB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XtnIkh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XtnIkx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XtnIlB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xt74tB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDUEv0EemT5f_Ewhfs6A" target="_Xt74sB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xt74tR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xt74uR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xt74tB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDUEv0EemT5f_Ewhfs6A" target="_Xt74sB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xt74tR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xt74uR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xt74th0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xt74tx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xt74uB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xt74th0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xt74tx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xt74uB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XuFptB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vrmMEv0EemT5f_Ewhfs6A" target="_XuFpsB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XuFptR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuFpuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XuFptB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vrmMEv0EemT5f_Ewhfs6A" target="_XuFpsB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XuFptR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuFpuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XuFpth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuFptx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuFpuB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XuFpth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuFptx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuFpuB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XuocRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmtsEv0EemT5f_Ewhfs6A" target="_XuocQB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XuocRR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuocSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XuocRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmtsEv0EemT5f_Ewhfs6A" target="_XuocQB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XuocRR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuocSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XuocRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuocRx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuocSB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XuocRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuocRx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuocSB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xu7XNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfqkv0EemT5f_Ewhfs6A" target="_Xu7XMB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xu7XNR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xu7XOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xu7XNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfqkv0EemT5f_Ewhfs6A" target="_Xu7XMB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xu7XNR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xu7XOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xu7XNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xu7XNx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xu7XOB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xu7XNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xu7XNx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xu7XOB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XvibNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn76kv0EemT5f_Ewhfs6A" target="_XvibMB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XvibNR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XvibOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XvibNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn76kv0EemT5f_Ewhfs6A" target="_XvibMB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XvibNR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XvibOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XvibNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XvibNx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XvibOB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XvibNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XvibNx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XvibOB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xv4ZdB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vicQEv0EemT5f_Ewhfs6A" target="_Xv4ZcB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xv4ZdR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv4ZeR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xv4ZdB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vicQEv0EemT5f_Ewhfs6A" target="_Xv4ZcB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xv4ZdR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv4ZeR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xv4Zdh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv4Zdx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv4ZeB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xv4Zdh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv4Zdx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv4ZeB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xv-gER0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqYEv0EemT5f_Ewhfs6A" target="_Xv95AB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xv-gEh0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv-gFh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xv-gER0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqYEv0EemT5f_Ewhfs6A" target="_Xv95AB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xv-gEh0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv-gFh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xv-gEx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv-gFB0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv-gFR0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xv-gEx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv-gFB0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv-gFR0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XwgrlB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxNEv0EemT5f_Ewhfs6A" target="_XwgrkB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XwgrlR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XwgrmR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XwgrlB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxNEv0EemT5f_Ewhfs6A" target="_XwgrkB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XwgrlR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XwgrmR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xwgrlh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xwgrlx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XwgrmB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xwgrlh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xwgrlx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XwgrmB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xw00pB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxAEv0EemT5f_Ewhfs6A" target="_Xw00oB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xw00pR0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xw00qR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xw00pB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxAEv0EemT5f_Ewhfs6A" target="_Xw00oB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xw00pR0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xw00qR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xw00ph0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xw00px0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xw00qB0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xw00ph0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xw00px0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xw00qB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XxaDcR0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iEA1sFolEemu443YKSGnxQ" target="_XxZcYB0zEeqCFrodiWelgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XxaDch0zEeqCFrodiWelgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XxaDdh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XxaDcR0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iEA1sFolEemu443YKSGnxQ" target="_XxZcYB0zEeqCFrodiWelgQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XxaDch0zEeqCFrodiWelgQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxaDdh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XxaDcx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XxaDdB0zEeqCFrodiWelgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XxaDdR0zEeqCFrodiWelgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XxaDcx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxaDdB0zEeqCFrodiWelgQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxaDdR0zEeqCFrodiWelgQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_UDyhIES5Eem_eeeaz1ENMQ" type="PapyrusUMLClassDiagram" name="EquipmentModelDetail" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_Yvs2oES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="12621752">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2oUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_xtfggDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs2okS5Eem_eeeaz1ENMQ" x="-58" y="-17" width="341" height="21"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Yvs210S5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs22ES5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs22US5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs22kS5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvs220S5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvs23ES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvs23US5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+    <children xsi:type="notation:Shape" xmi:id="_Yvs2oES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="12621752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2oUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_xtfggDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs2okS5Eem_eeeaz1ENMQ" x="-58" y="-17" width="341" height="21"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Yvs210S5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs22ES5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs22US5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs22kS5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvs220S5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_Yvs23ES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_Yvs23US5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvs23kS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvs230S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvs24ES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs24US5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvs24kS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvs240S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvs25ES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvs25US5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs25kS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvs250S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvs26ES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvs26US5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvs26kS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs260S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs3FUS5Eem_eeeaz1ENMQ" x="1371" y="598" width="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Yvur1US5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvur1kS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvur10S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvur2ES5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvur2US5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvur2kS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvur20S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvs23kS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvs230S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvs24ES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs24US5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvs24kS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvs240S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvs25ES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvs25US5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs25kS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvs250S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvs26ES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvs26US5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvs26kS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs260S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs3FUS5Eem_eeeaz1ENMQ" x="1371" y="598" width="141"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Yvur1US5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvur1kS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvur10S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvur2ES5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvur2US5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_Yvur2kS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_Yvur20S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvur3ES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvur3US5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvur3kS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvur30S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvur4ES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvur4US5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvur4kS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvur40S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvur5ES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvur5US5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvur5kS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvur50S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvur6ES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvur6US5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvusE0S5Eem_eeeaz1ENMQ" x="1371" y="58" width="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_YvusfES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvusfUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvusfkS5Eem_eeeaz1ENMQ" x="-58" y="-97" width="341" height="21"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_YvvTPUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvvTPkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvvTP0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvvTQES5Eem_eeeaz1ENMQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_YvvTQUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YvvTQkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YvvTQ0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvur3ES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvur3US5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvur3kS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvur30S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvur4ES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvur4US5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvur4kS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvur40S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvur5ES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvur5US5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvur5kS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvur50S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvur6ES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvur6US5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvusE0S5Eem_eeeaz1ENMQ" x="1371" y="58" width="141"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_YvusfES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvusfUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvusfkS5Eem_eeeaz1ENMQ" x="-58" y="-97" width="341" height="21"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_YvvTPUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvvTPkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvvTP0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvvTQES5Eem_eeeaz1ENMQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_YvvTQUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_YvvTQkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_YvvTQ0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_w2HjYETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_w2HjYUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_0XD6kETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_0XD6kUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_1fvZ4ETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1fvZ4UTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_2oP6EETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_2oP6EUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_3y3TEETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_3y3TEUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_FiA4YEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_FiA4YUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TiAoYEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TiAoYUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_7GGYQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_7GGYQVFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_7GG_UFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_7GG_UVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_YvvTRES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_YvvTRUS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_YvvTRkS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTR0S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_YvvTSES5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_YvvTSUS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_YvvTSkS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_YvvTS0S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTTES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_YvvTTUS5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_YvvTTkS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_YvvTT0S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_YvvTUES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTUUS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTc0S5Eem_eeeaz1ENMQ" x="-1" y="100" width="402" height="285"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Yvv6IUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6IkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6I0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvv6JES5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvv6JUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvv6JkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvv6J0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="_w2HjYETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_w2HjYUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_0XD6kETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_0XD6kUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_1fvZ4ETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_1fvZ4UTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_2oP6EETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_2oP6EUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_3y3TEETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_3y3TEUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_FiA4YEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_FiA4YUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TiAoYEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TiAoYUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_7GGYQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_7GGYQVFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_7GG_UFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_7GG_UVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_YvvTRES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_YvvTRUS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_YvvTRkS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTR0S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_YvvTSES5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_YvvTSUS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_YvvTSkS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_YvvTS0S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTTES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_YvvTTUS5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_YvvTTkS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_YvvTT0S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_YvvTUES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTUUS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTc0S5Eem_eeeaz1ENMQ" x="-1" y="100" width="402" height="285"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Yvv6IUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6IkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6I0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvv6JES5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvv6JUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_Yvv6JkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_Yvv6J0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_VS82AElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VS82AUlmEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Wivp8ElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Wivp8UlmEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_xMlVcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xMlVcVFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_xMmjkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xMmjkVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvv6KES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvv6KUS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvv6KkS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6K0S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvv6LES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvv6LUS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvv6LkS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvv6L0S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6MES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvv6MUS5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvv6MkS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvv6M0S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvv6NES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6NUS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6V0S5Eem_eeeaz1ENMQ" x="828" y="40" width="413" height="127"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_YvwhXUS5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="13420443">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhXkS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvwhX0S5Eem_eeeaz1ENMQ" x="-58" y="23" width="340" height="20"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Yvy9QES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9QUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9QkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvy9Q0S5Eem_eeeaz1ENMQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9RES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvy9RUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvy9RkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="_VS82AElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_VS82AUlmEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Wivp8ElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Wivp8UlmEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_xMlVcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_xMlVcVFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_xMmjkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_xMmjkVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvv6KES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvv6KUS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvv6KkS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6K0S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvv6LES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvv6LUS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvv6LkS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvv6L0S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6MES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvv6MUS5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvv6MkS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvv6M0S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvv6NES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6NUS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6V0S5Eem_eeeaz1ENMQ" x="828" y="40" width="413" height="127"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_YvwhXUS5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="13420443">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhXkS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvwhX0S5Eem_eeeaz1ENMQ" x="-58" y="23" width="340" height="20"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Yvy9QES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9QUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9QkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvy9Q0S5Eem_eeeaz1ENMQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9RES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_Yvy9RUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_Yvy9RkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_nBARsES8Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_nBARsUS8Eem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_w0JswEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_w0JswUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__UZDEEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__UZDEUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_5NAIoFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_5NAIoVFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_5NAIolFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_5NAIo1FgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9R0S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9SES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9SUS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9SkS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9S0S5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9TES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9TUS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9TkS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9T0S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9UES5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9UUS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9UkS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9U0S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9VES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9dkS5Eem_eeeaz1ENMQ" x="-60" y="587" width="481" height="214"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Yvy9qES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9qUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9qkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvy9q0S5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9rES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvy9rUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvy9rkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="_nBARsES8Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_nBARsUS8Eem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_w0JswEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_w0JswUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="__UZDEEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="__UZDEUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_5NAIoFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_5NAIoVFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_5NAIolFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_5NAIo1FgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9R0S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9SES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9SUS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9SkS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9S0S5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9TES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9TUS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9TkS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9T0S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9UES5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9UUS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9UkS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9U0S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9VES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9dkS5Eem_eeeaz1ENMQ" x="-60" y="587" width="481" height="214"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Yvy9qES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9qUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9qkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvy9q0S5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9rES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_Yvy9rUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_Yvy9rkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_Yvy9r0S5Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvy9yUS5Eem_eeeaz1ENMQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_1rg-4FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1rg-4VFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_1ri0EFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1ri0EVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9ykS5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9y0S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9zES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9zUS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9zkS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9z0S5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy90ES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy90US5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy90kS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy900S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy91ES5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy91US5Eem_eeeaz1ENMQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy91kS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy910S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9-US5Eem_eeeaz1ENMQ" x="438" y="594" width="381" height="147"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_ESGL0ElgEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ESGL0klgEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ESGL00lgEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ESGL1ElgEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ESGL1UlgEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_afbM0ElkEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_afbM0UlkEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_xbbZEEllEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xbbZEUllEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ikqcUEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ikqcUUvaEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_jbpHoEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_jbpHoUvaEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_zk1mQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_zk1mQVFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_zk2NUFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_zk2NUVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ESGL1klgEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ESGL10lgEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ESGL2ElgEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL2UlgEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ESGL2klgEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ESGL20lgEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ESGL3ElgEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ESGL3UlgEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL3klgEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ESGL30lgEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ESGL4ElgEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ESGL4UlgEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ESGL4klgEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL40lgEemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL0UlgEemT5f_Ewhfs6A" x="882" y="343" width="401" height="136"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_87cVEElkEemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_87cVEklkEemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87cVEUlkEemT5f_Ewhfs6A" x="-58" y="-57" width="341" height="21"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_dOMqwEvWEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_dOMqwkvWEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dOMqw0vWEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dOMqxEvWEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dOMqxUvWEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_Ai8VUEvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ai8VUUvYEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Bhvf4EvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bhvf4UvYEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vGYd8FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vGYd8VFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vGYd8lFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vGYd81FgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dOMqxkvWEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_dOMqx0vWEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dOMqyEvWEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dOMqyUvWEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dONR0EvWEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dONR0UvWEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_dONR0kvWEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dONR00vWEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dONR1EvWEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dONR1UvWEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dONR1kvWEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_dONR10vWEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dONR2EvWEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dONR2UvWEemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dOMqwUvWEemT5f_Ewhfs6A" x="520" y="-18" width="281" height="159"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_gPB_sEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_gPB_skvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_gPB_s0vwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gPB_tEvwEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_gPB_tUvwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_kkeEAEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kkeEAUvyEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_lZxUUEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_lZxUUUvyEemT5f_Ewhfs6A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_soYKcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_soYKcVFgEemgMYGocegK5A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_soZYkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_soZYkVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_gPB_tkvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_gPB_t0vwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_gPB_uEvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_uUvwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_gPB_ukvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_gPB_u0vwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_gPB_vEvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_gPB_vUvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_vkvwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_gPB_v0vwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_gPB_wEvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_gPB_wUvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_gPB_wkvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_w0vwEemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_sUvwEemT5f_Ewhfs6A" x="682" y="-262" width="301" height="113"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_7M57YEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12621752">
-      <children xmi:type="notation:DecorationNode" xmi:id="_7M6icEvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7M6icUvwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7M6ickvwEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_7M6ic0vwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_7M6idEvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_7M6idUvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7M6idkvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M6id0vwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_7M6ieEvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_7M6ieUvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_7M6iekvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7M6ie0vwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M6ifEvwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_7M6ifUvwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_7M6ifkvwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_7M6if0vwEemT5f_Ewhfs6A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7M6igEvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M6igUvwEemT5f_Ewhfs6A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M57YUvwEemT5f_Ewhfs6A" x="1371" y="-262" width="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_4jT6oE2rEemQQPVBE79CWA" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_4jaBQE2rEemQQPVBE79CWA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4jaBQU2rEemQQPVBE79CWA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4jaBQk2rEemQQPVBE79CWA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_4jaoUE2rEemQQPVBE79CWA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_ZEoQwE2sEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_6B6BtS7BEemaZq0-6SfFXw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZEoQwU2sEemQQPVBE79CWA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_4jaoUU2rEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_4jaoUk2rEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4jaoU02rEemQQPVBE79CWA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jaoVE2rEemQQPVBE79CWA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_4jaoVU2rEemQQPVBE79CWA" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_4jaoVk2rEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_4jaoV02rEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4jaoWE2rEemQQPVBE79CWA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jaoWU2rEemQQPVBE79CWA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_4jbPYE2rEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_4jbPYU2rEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_4jbPYk2rEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4jbPY02rEemQQPVBE79CWA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jbPZE2rEemQQPVBE79CWA"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jT6oU2rEemQQPVBE79CWA" x="1124" y="-100" height="109"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_8PgDEE2sEemQQPVBE79CWA" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_8PhRME2sEemQQPVBE79CWA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8PhRMU2sEemQQPVBE79CWA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8PhRMk2sEemQQPVBE79CWA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_8PhRM02sEemQQPVBE79CWA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_Pai7oE2tEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Aw6nkTlbEemDl_QGWIY6yg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Pai7oU2tEemQQPVBE79CWA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_8PhRNE2sEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_8PhRNU2sEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_8PhRNk2sEemQQPVBE79CWA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PhRN02sEemQQPVBE79CWA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_8Ph4QE2sEemQQPVBE79CWA" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_8Ph4QU2sEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_8Ph4Qk2sEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_8Ph4Q02sEemQQPVBE79CWA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Ph4RE2sEemQQPVBE79CWA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_8Ph4RU2sEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_8Ph4Rk2sEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_8Ph4R02sEemQQPVBE79CWA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_8Ph4SE2sEemQQPVBE79CWA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Ph4SU2sEemQQPVBE79CWA"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PgDEU2sEemQQPVBE79CWA" x="1055" y="617" height="61"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_EM33QHspEemfSIWqmJMEQA" type="Interface_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_EM33QnspEemfSIWqmJMEQA" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EM33Q3spEemfSIWqmJMEQA" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EM33RHspEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_EM33RXspEemfSIWqmJMEQA" type="Interface_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EM33RnspEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_EM33R3spEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EM33SHspEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33SXspEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_EM33SnspEemfSIWqmJMEQA" type="Interface_OperationCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_XY8twHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_omJZkHstEemfSIWqmJMEQA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_Yvy9r0S5Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvy9yUS5Eem_eeeaz1ENMQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_1rg-4FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_1rg-4VFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_1ri0EFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_1ri0EVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9ykS5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9y0S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9zES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9zUS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9zkS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9z0S5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy90ES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy90US5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy90kS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy900S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy91ES5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy91US5Eem_eeeaz1ENMQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy91kS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy910S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9-US5Eem_eeeaz1ENMQ" x="438" y="594" width="381" height="147"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ESGL0ElgEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ESGL0klgEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ESGL00lgEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ESGL1ElgEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ESGL1UlgEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_afbM0ElkEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_afbM0UlkEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_xbbZEEllEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_xbbZEUllEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_ikqcUEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ikqcUUvaEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_jbpHoEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_jbpHoUvaEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_zk1mQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_zk1mQVFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_zk2NUFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_zk2NUVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ESGL1klgEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ESGL10lgEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ESGL2ElgEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL2UlgEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ESGL2klgEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ESGL20lgEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ESGL3ElgEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ESGL3UlgEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL3klgEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ESGL30lgEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ESGL4ElgEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ESGL4UlgEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ESGL4klgEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL40lgEemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL0UlgEemT5f_Ewhfs6A" x="882" y="343" width="401" height="136"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_87cVEElkEemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_87cVEklkEemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_87cVEUlkEemT5f_Ewhfs6A" x="-58" y="-57" width="341" height="21"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_dOMqwEvWEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_dOMqwkvWEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dOMqw0vWEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dOMqxEvWEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_dOMqxUvWEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Ai8VUEvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ai8VUUvYEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Bhvf4EvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Bhvf4UvYEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_vGYd8FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_vGYd8VFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_vGYd8lFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_vGYd81FgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_dOMqxkvWEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_dOMqx0vWEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_dOMqyEvWEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dOMqyUvWEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_dONR0EvWEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_dONR0UvWEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_dONR0kvWEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_dONR00vWEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dONR1EvWEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_dONR1UvWEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_dONR1kvWEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_dONR10vWEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_dONR2EvWEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dONR2UvWEemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dOMqwUvWEemT5f_Ewhfs6A" x="520" y="-18" width="281" height="159"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_gPB_sEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_gPB_skvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_gPB_s0vwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_gPB_tEvwEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_gPB_tUvwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_kkeEAEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_kkeEAUvyEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_lZxUUEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_lZxUUUvyEemT5f_Ewhfs6A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_soYKcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_soYKcVFgEemgMYGocegK5A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_soZYkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_soZYkVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_gPB_tkvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_gPB_t0vwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_gPB_uEvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_uUvwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_gPB_ukvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_gPB_u0vwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_gPB_vEvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_gPB_vUvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_vkvwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_gPB_v0vwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_gPB_wEvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_gPB_wUvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_gPB_wkvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_w0vwEemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_sUvwEemT5f_Ewhfs6A" x="682" y="-262" width="301" height="113"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_7M57YEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12621752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_7M6icEvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7M6icUvwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7M6ickvwEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_7M6ic0vwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_7M6idEvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_7M6idUvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_7M6idkvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M6id0vwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_7M6ieEvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_7M6ieUvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_7M6iekvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_7M6ie0vwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M6ifEvwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_7M6ifUvwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_7M6ifkvwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_7M6if0vwEemT5f_Ewhfs6A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_7M6igEvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M6igUvwEemT5f_Ewhfs6A"/>
+      </children>
+      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M57YUvwEemT5f_Ewhfs6A" x="1371" y="-262" width="141"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_4jT6oE2rEemQQPVBE79CWA" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4jaBQE2rEemQQPVBE79CWA" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4jaBQU2rEemQQPVBE79CWA" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4jaBQk2rEemQQPVBE79CWA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_4jaoUE2rEemQQPVBE79CWA" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_ZEoQwE2sEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_6B6BtS7BEemaZq0-6SfFXw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ZEoQwU2sEemQQPVBE79CWA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_4jaoUU2rEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_4jaoUk2rEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_4jaoU02rEemQQPVBE79CWA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jaoVE2rEemQQPVBE79CWA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_4jaoVU2rEemQQPVBE79CWA" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_4jaoVk2rEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_4jaoV02rEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_4jaoWE2rEemQQPVBE79CWA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jaoWU2rEemQQPVBE79CWA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_4jbPYE2rEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_4jbPYU2rEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_4jbPYk2rEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_4jbPY02rEemQQPVBE79CWA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jbPZE2rEemQQPVBE79CWA"/>
+      </children>
+      <element href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jT6oU2rEemQQPVBE79CWA" x="1124" y="-100" height="109"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_8PgDEE2sEemQQPVBE79CWA" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_8PhRME2sEemQQPVBE79CWA" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8PhRMU2sEemQQPVBE79CWA" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8PhRMk2sEemQQPVBE79CWA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_8PhRM02sEemQQPVBE79CWA" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Pai7oE2tEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_Aw6nkTlbEemDl_QGWIY6yg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Pai7oU2tEemQQPVBE79CWA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_8PhRNE2sEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_8PhRNU2sEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_8PhRNk2sEemQQPVBE79CWA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8PhRN02sEemQQPVBE79CWA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_8Ph4QE2sEemQQPVBE79CWA" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_8Ph4QU2sEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_8Ph4Qk2sEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_8Ph4Q02sEemQQPVBE79CWA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8Ph4RE2sEemQQPVBE79CWA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_8Ph4RU2sEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_8Ph4Rk2sEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_8Ph4R02sEemQQPVBE79CWA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_8Ph4SE2sEemQQPVBE79CWA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8Ph4SU2sEemQQPVBE79CWA"/>
+      </children>
+      <element href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8PgDEU2sEemQQPVBE79CWA" x="1055" y="617" height="61"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_EM33QHspEemfSIWqmJMEQA" type="Interface_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_EM33QnspEemfSIWqmJMEQA" type="Interface_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EM33Q3spEemfSIWqmJMEQA" type="Interface_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EM33RHspEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_EM33RXspEemfSIWqmJMEQA" type="Interface_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_EM33RnspEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_EM33R3spEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_EM33SHspEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33SXspEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_EM33SnspEemfSIWqmJMEQA" type="Interface_OperationCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_XY8twHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_omJZkHstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1561,11 +1561,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_FCC50HsrEemfSIWqmJMEQA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8twXstEemfSIWqmJMEQA"/>
+          <element href="TapiEquipment.uml#_FCC50HsrEemfSIWqmJMEQA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8twXstEemfSIWqmJMEQA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_XY8twnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_peFHIHstEemfSIWqmJMEQA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_XY8twnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_peFHIHstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1574,11 +1574,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_nJXkcHsrEemfSIWqmJMEQA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8tw3stEemfSIWqmJMEQA"/>
+          <element href="TapiEquipment.uml#_nJXkcHsrEemfSIWqmJMEQA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8tw3stEemfSIWqmJMEQA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_XY8txHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_qfPpMHstEemfSIWqmJMEQA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_XY8txHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_qfPpMHstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1587,11 +1587,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_R3dQkHssEemfSIWqmJMEQA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8txXstEemfSIWqmJMEQA"/>
+          <element href="TapiEquipment.uml#_R3dQkHssEemfSIWqmJMEQA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8txXstEemfSIWqmJMEQA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_XY8txnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_rKry4HstEemfSIWqmJMEQA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_XY8txnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_rKry4HstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1600,2098 +1600,2098 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_SHEkcHstEemfSIWqmJMEQA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8tx3stEemfSIWqmJMEQA"/>
+          <element href="TapiEquipment.uml#_SHEkcHstEemfSIWqmJMEQA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8tx3stEemfSIWqmJMEQA"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EM33S3spEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_EM33THspEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EM33TXspEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33TnspEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_EM33S3spEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_EM33THspEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_EM33TXspEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33TnspEemfSIWqmJMEQA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_EM33T3spEemfSIWqmJMEQA" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EM33UHspEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_EM33UXspEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EM33UnspEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33U3spEemfSIWqmJMEQA"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_EM33T3spEemfSIWqmJMEQA" type="Interface_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_EM33UHspEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_EM33UXspEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_EM33UnspEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33U3spEemfSIWqmJMEQA"/>
       </children>
-      <element xmi:type="uml:Interface" href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33QXspEemfSIWqmJMEQA" x="45" y="-300" height="181"/>
+      <element href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33QXspEemfSIWqmJMEQA" x="45" y="-300" height="181"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l0TgIHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l0TgIXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l0TgI3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <children xsi:type="notation:Shape" xmi:id="_UNmwAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UNmwAaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UNmwA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l0TgInh9EeqVN_GB3rPx7g" x="1571" y="598"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UNmwAqawEeqJcvXkREZ1XQ" x="1571" y="598"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l0rTkHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l0rTkXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l0rTk3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_UOKwsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UOKwsaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UOLXwKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l0rTknh9EeqVN_GB3rPx7g" x="1571" y="58"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UOKwsqawEeqJcvXkREZ1XQ" x="1571" y="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l1M4AHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l1M4AXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l1M4A3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UO5wgKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UO5wgaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UO5wg6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l1M4Anh9EeqVN_GB3rPx7g" x="199" y="100"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UO5wgqawEeqJcvXkREZ1XQ" x="199" y="100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l2OLsHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l2OLsXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l2OLs3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UQK70KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UQK70aawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQK706awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l2OLsnh9EeqVN_GB3rPx7g" x="199"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UQK70qawEeqJcvXkREZ1XQ" x="199"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l2nNQHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l2nNQXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l2nNQ3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <children xsi:type="notation:Shape" xmi:id="_UQ57oKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UQ57oaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQ57o6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l2nNQnh9EeqVN_GB3rPx7g" x="1028" y="40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UQ57oqawEeqJcvXkREZ1XQ" x="1028" y="40"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l3IKoHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l3IKoXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l3IKo3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <children xsi:type="notation:Shape" xmi:id="_URtz8KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_URtz8aawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_URtz86awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l3IKonh9EeqVN_GB3rPx7g" x="1028" y="-60"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_URtz8qawEeqJcvXkREZ1XQ" x="1028" y="-60"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l3QtgHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l3QtgXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l3Qtg3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UR6oQKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UR6oQaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UR6oQ6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l3Qtgnh9EeqVN_GB3rPx7g" x="1028" y="-60"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UR6oQqawEeqJcvXkREZ1XQ" x="1028" y="-60"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l3pvEHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l3pvEXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l3pvE3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UShFMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UShFMaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UShFM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l3pvEnh9EeqVN_GB3rPx7g" x="140" y="587"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UShFMqawEeqJcvXkREZ1XQ" x="140" y="587"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l4NvwHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l4NvwXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l4Nvw3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UTjnAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UTjnAaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UTjnA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4Nvwnh9EeqVN_GB3rPx7g" x="140" y="487"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UTjnAqawEeqJcvXkREZ1XQ" x="140" y="487"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l4mKQHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l4mKQXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l4mxUHh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UUVqIKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UUVqIaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UUVqI6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4mKQnh9EeqVN_GB3rPx7g" x="638" y="594"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UUVqIqawEeqJcvXkREZ1XQ" x="638" y="594"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l5WYMHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l5WYMXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l5WYM3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UVv_YKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UVv_YaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UVv_Y6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l5WYMnh9EeqVN_GB3rPx7g" x="1082" y="343"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UVv_YqawEeqJcvXkREZ1XQ" x="1082" y="343"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l5_RYHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l5_RYXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l5_RY3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UW7EEKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UW7EEaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UW7EE6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l5_RYnh9EeqVN_GB3rPx7g" x="1082" y="243"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UW7EEqawEeqJcvXkREZ1XQ" x="1082" y="243"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l6EJ4Hh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l6EJ4Xh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l6EJ43h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UXEOAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UXE1EKawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXE1EqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6EJ4nh9EeqVN_GB3rPx7g" x="1082" y="243"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UXE1EaawEeqJcvXkREZ1XQ" x="1082" y="243"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l6dLcHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l6dLcXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l6dLc3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UXtHMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UXtHMaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXtHM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6dLcnh9EeqVN_GB3rPx7g" x="720" y="-18"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UXtHMqawEeqJcvXkREZ1XQ" x="720" y="-18"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l6-v4Hh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l6-v4Xh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l6-v43h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UYi0sKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UYi0saawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYi0s6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6-v4nh9EeqVN_GB3rPx7g" x="720" y="-118"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UYi0sqawEeqJcvXkREZ1XQ" x="720" y="-118"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l7FdkHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l7FdkXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l7Fdk3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UYslsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UYslsaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYsls6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l7Fdknh9EeqVN_GB3rPx7g" x="720" y="-118"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UYslsqawEeqJcvXkREZ1XQ" x="720" y="-118"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l7aNsHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l7aNsXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l7a0wHh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UZOxMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UZOxMaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UZOxM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l7aNsnh9EeqVN_GB3rPx7g" x="882" y="-262"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UZOxMqawEeqJcvXkREZ1XQ" x="882" y="-262"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l74u0Hh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l74u0Xh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l74u03h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UaBbYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UaBbYaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaCCcKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l74u0nh9EeqVN_GB3rPx7g" x="882" y="-362"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UaBbYqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l7-1cHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l7-1cXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l7_cgHh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UaLMYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UaLMYaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaLMY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l7-1cnh9EeqVN_GB3rPx7g" x="882" y="-362"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UaLMYqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l8GxQHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l8GxQXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l8GxQ3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_UaVkcKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UaVkcaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaVkc6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8GxQnh9EeqVN_GB3rPx7g" x="882" y="-362"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UaVkcqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l8fLwHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l8fLwXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l8fy0Hh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_Ua8BYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Ua8BYaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ua8BY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8fLwnh9EeqVN_GB3rPx7g" x="1571" y="-262"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ua8BYqawEeqJcvXkREZ1XQ" x="1571" y="-262"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l840YHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l840YXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l840Y3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UbpMAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UbpMAaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UbpMA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l840Ynh9EeqVN_GB3rPx7g" x="1324" y="-100"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UbpMAqawEeqJcvXkREZ1XQ" x="1324" y="-100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l9FosHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l9FosXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9Fos3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Ub98IKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Ub98IaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ub98I6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l9Fosnh9EeqVN_GB3rPx7g" x="1324" y="-200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ub98IqawEeqJcvXkREZ1XQ" x="1324" y="-200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l9U5QHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l9U5QXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9U5Q3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UcWWoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UcWWoaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcWWo6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l9U5Qnh9EeqVN_GB3rPx7g" x="1255" y="617"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UcWWoqawEeqJcvXkREZ1XQ" x="1255" y="617"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l9hGgHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l9hGgXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9hGg3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
+    <children xsi:type="notation:Shape" xmi:id="_UcuKEKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_UcuKEaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcuKE6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l9hGgnh9EeqVN_GB3rPx7g" x="1255" y="517"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UcuKEqawEeqJcvXkREZ1XQ" x="1255" y="517"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l9pCUHh9EeqVN_GB3rPx7g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l9pCUXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9pCU3h9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Uc6-YKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Uc6-YaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Uc6-Y6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l9pCUnh9EeqVN_GB3rPx7g" x="245" y="-300"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Uc6-YqawEeqJcvXkREZ1XQ" x="245" y="-300"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_UDyhIUS5Eem_eeeaz1ENMQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_UDyhIkS5Eem_eeeaz1ENMQ"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_UDyhI0S5Eem_eeeaz1ENMQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_UDyhIUS5Eem_eeeaz1ENMQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_UDyhIkS5Eem_eeeaz1ENMQ"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_UDyhI0S5Eem_eeeaz1ENMQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_YvsPkES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_8PgDEE2sEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPkUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPkkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPk0S5Eem_eeeaz1ENMQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPlES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPlUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPlkS5Eem_eeeaz1ENMQ" x="-64" y="-40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPl0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPmES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPmUS5Eem_eeeaz1ENMQ" x="39" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPmkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPm0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPnES5Eem_eeeaz1ENMQ" x="-39" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPnUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPnkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPn0S5Eem_eeeaz1ENMQ" x="31" y="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPoES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPoUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPokS5Eem_eeeaz1ENMQ" x="-16" y="7"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YvsPo0S5Eem_eeeaz1ENMQ"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_Aw5ZcDlbEemDl_QGWIY6yg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvsPpES5Eem_eeeaz1ENMQ" points="[1044, 644, -643984, -643984]$[1366, 644, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvsPpUS5Eem_eeeaz1ENMQ" id="(1.0,0.3945578231292517)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvsPpkS5Eem_eeeaz1ENMQ" id="(0.0,0.5737704918032787)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Yvs2o0S5Eem_eeeaz1ENMQ" type="Association_Edge" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_Yvy9QES5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2pES5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2pUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2pkS5Eem_eeeaz1ENMQ" x="14" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2p0S5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2qES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2qUS5Eem_eeeaz1ENMQ" x="-8" y="10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2qkS5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2q0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2rES5Eem_eeeaz1ENMQ" x="19" y="-46"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2rUS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2rkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2r0S5Eem_eeeaz1ENMQ" x="-16" y="65"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2sES5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2sUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2skS5Eem_eeeaz1ENMQ" x="13" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2s0S5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2tES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2tUS5Eem_eeeaz1ENMQ" x="-18" y="-12"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Yvs2tkS5Eem_eeeaz1ENMQ"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yvs2ukS5Eem_eeeaz1ENMQ" points="[309, 374, -643984, -643984]$[309, 577, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yvs2u0S5Eem_eeeaz1ENMQ" id="(0.20149253731343283,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yvs2vES5Eem_eeeaz1ENMQ" id="(0.2910602910602911,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YvtdsES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdsUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdskS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvtds0S5Eem_eeeaz1ENMQ" x="-28" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdtES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdtUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtdtkS5Eem_eeeaz1ENMQ" x="-48" y="-34"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvtdt0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtduES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtduUS5Eem_eeeaz1ENMQ" x="2" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdukS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvtdu0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtdvES5Eem_eeeaz1ENMQ" x="-2" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdvUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdvkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvtdv0S5Eem_eeeaz1ENMQ" x="29" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdwES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdwUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtdwkS5Eem_eeeaz1ENMQ" x="-26" y="20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Yvtdw0S5Eem_eeeaz1ENMQ"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yvtdx0S5Eem_eeeaz1ENMQ" points="[980, 167, -643984, -643984]$[980, 180, -643984, -643984]$[740, 180, -643984, -643984]$[740, 594, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvtdyES5Eem_eeeaz1ENMQ" id="(0.36803874092009686,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvtdyUS5Eem_eeeaz1ENMQ" id="(0.7926509186351706,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YvteBES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvteBUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteB0S5Eem_eeeaz1ENMQ" x="-12" y="-9"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvteCES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteCkS5Eem_eeeaz1ENMQ" x="9" y="-3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvteC0S5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YvteDES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YvteDUS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+    <element href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YvsPkES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_8PgDEE2sEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPkUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPkkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPk0S5Eem_eeeaz1ENMQ" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPlES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPlUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPlkS5Eem_eeeaz1ENMQ" x="-64" y="-40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPl0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPmES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPmUS5Eem_eeeaz1ENMQ" x="39" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPmkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPm0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPnES5Eem_eeeaz1ENMQ" x="-39" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPnUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPnkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPn0S5Eem_eeeaz1ENMQ" x="31" y="27"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPoES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPoUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPokS5Eem_eeeaz1ENMQ" x="-16" y="7"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_YvsPo0S5Eem_eeeaz1ENMQ"/>
+      <element href="TapiEquipment.uml#_Aw5ZcDlbEemDl_QGWIY6yg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvsPpES5Eem_eeeaz1ENMQ" points="[1044, 644, -643984, -643984]$[1366, 644, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvsPpUS5Eem_eeeaz1ENMQ" id="(1.0,0.3945578231292517)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvsPpkS5Eem_eeeaz1ENMQ" id="(0.0,0.5737704918032787)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_Yvs2o0S5Eem_eeeaz1ENMQ" type="Association_Edge" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_Yvy9QES5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2pES5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2pUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2pkS5Eem_eeeaz1ENMQ" x="14" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2p0S5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2qES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2qUS5Eem_eeeaz1ENMQ" x="-8" y="10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2qkS5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2q0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2rES5Eem_eeeaz1ENMQ" x="19" y="-46"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2rUS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2rkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2r0S5Eem_eeeaz1ENMQ" x="-16" y="65"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2sES5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2sUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2skS5Eem_eeeaz1ENMQ" x="13" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2s0S5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2tES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2tUS5Eem_eeeaz1ENMQ" x="-18" y="-12"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Yvs2tkS5Eem_eeeaz1ENMQ"/>
+      <element href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Yvs2ukS5Eem_eeeaz1ENMQ" points="[309, 374, -643984, -643984]$[309, 577, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Yvs2u0S5Eem_eeeaz1ENMQ" id="(0.20149253731343283,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Yvs2vES5Eem_eeeaz1ENMQ" id="(0.2910602910602911,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_YvtdsES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdsUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdskS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvtds0S5Eem_eeeaz1ENMQ" x="-28" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdtES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdtUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtdtkS5Eem_eeeaz1ENMQ" x="-48" y="-34"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvtdt0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtduES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtduUS5Eem_eeeaz1ENMQ" x="2" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdukS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvtdu0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtdvES5Eem_eeeaz1ENMQ" x="-2" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdvUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdvkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvtdv0S5Eem_eeeaz1ENMQ" x="29" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdwES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdwUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtdwkS5Eem_eeeaz1ENMQ" x="-26" y="20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Yvtdw0S5Eem_eeeaz1ENMQ"/>
+      <element href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Yvtdx0S5Eem_eeeaz1ENMQ" points="[980, 167, -643984, -643984]$[980, 180, -643984, -643984]$[740, 180, -643984, -643984]$[740, 594, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvtdyES5Eem_eeeaz1ENMQ" id="(0.36803874092009686,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvtdyUS5Eem_eeeaz1ENMQ" id="(0.7926509186351706,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_YvteBES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvteBUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteB0S5Eem_eeeaz1ENMQ" x="-12" y="-9"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvteCES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteCkS5Eem_eeeaz1ENMQ" x="9" y="-3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvteC0S5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:id="_YvteDES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:id="_YvteDUS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteDkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteD0S5Eem_eeeaz1ENMQ" x="73" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvteEES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteEUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteEkS5Eem_eeeaz1ENMQ" x="-53" y="15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvteE0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteFES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteFUS5Eem_eeeaz1ENMQ" x="15" y="14"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvteFkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteF0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteGES5Eem_eeeaz1ENMQ" x="-26" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YvteGUS5Eem_eeeaz1ENMQ"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvteHUS5Eem_eeeaz1ENMQ" points="[543, 577, -643984, -643984]$[543, 374, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvteHkS5Eem_eeeaz1ENMQ" id="(0.7900207900207901,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvteH0S5Eem_eeeaz1ENMQ" id="(0.7985074626865671,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Yvv6dUS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6dkS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvv6d0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvv6eES5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6eUS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvv6ekS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvv6e0S5Eem_eeeaz1ENMQ" x="2" y="17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6fES5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhAES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhAUS5Eem_eeeaz1ENMQ" x="23" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhAkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhA0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhBES5Eem_eeeaz1ENMQ" x="-23" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhBUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhB0S5Eem_eeeaz1ENMQ" x="24" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhCES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhCkS5Eem_eeeaz1ENMQ" x="-24" y="-18"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YvwhC0S5Eem_eeeaz1ENMQ"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvwhDES5Eem_eeeaz1ENMQ" points="[1603, 339, -643984, -643984]$[1603, 409, -643984, -643984]$[1525, 409, -643984, -643984]$[1525, 479, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvwhDUS5Eem_eeeaz1ENMQ" id="(0.425531914893617,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvwhDkS5Eem_eeeaz1ENMQ" id="(0.425531914893617,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YvxvOkS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_4jT6oE2rEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvO0S5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvPES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvPUS5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvPkS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvP0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvQES5Eem_eeeaz1ENMQ" x="-8" y="70"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvQUS5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvQkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvQ0S5Eem_eeeaz1ENMQ" x="6" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvRES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvRUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvRkS5Eem_eeeaz1ENMQ" x="-6" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvR0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvSES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvSUS5Eem_eeeaz1ENMQ" x="24" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvSkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvS0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvTES5Eem_eeeaz1ENMQ" x="-8" y="-17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YvxvTUS5Eem_eeeaz1ENMQ"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_6B5aoC7BEemaZq0-6SfFXw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvxvTkS5Eem_eeeaz1ENMQ" points="[1143, 102, -643984, -643984]$[1215, 102, -643984, -643984]$[1215, 9, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvxvT0S5Eem_eeeaz1ENMQ" id="(1.0,0.47244094488188976)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvxvUES5Eem_eeeaz1ENMQ" id="(0.4473684210526316,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_QbC-0ElZEemT5f_Ewhfs6A" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_QbC-00lZEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ViYFAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbC-1ElZEemT5f_Ewhfs6A" x="36"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QbC-1UlZEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WMqYIElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbC-1klZEemT5f_Ewhfs6A" x="16" y="8"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QbC-10lZEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WztKAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl4ElZEemT5f_Ewhfs6A" x="21" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QbDl4UlZEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XcyjQElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl4klZEemT5f_Ewhfs6A" x="-21" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QbDl40lZEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YEElsElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl5ElZEemT5f_Ewhfs6A" x="21" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QbDl5UlZEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YthyYElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl5klZEemT5f_Ewhfs6A" x="-22" y="-17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_QbC-0UlZEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QbC-0klZEemT5f_Ewhfs6A" points="[1247, 130, -643984, -643984]$[1247, 349, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RwuYUElZEemT5f_Ewhfs6A" id="(0.4648910411622276,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RwuYUUlZEemT5f_Ewhfs6A" id="(0.3491271820448878,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MMsq4ElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_MMsq40lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xz2pUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMsq5ElgEemT5f_Ewhfs6A" x="-14" y="-8"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MMsq5UlgEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yc0GwEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMsq5klgEemT5f_Ewhfs6A" x="10" y="-6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR8ElgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZEHXUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR8UlgEemT5f_Ewhfs6A" x="15" y="-82"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR8klgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Zuz6IEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR80lgEemT5f_Ewhfs6A" x="-17" y="-40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR9ElgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aYUxMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR9UlgEemT5f_Ewhfs6A" x="15" y="-14"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR9klgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bALbYEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR90lgEemT5f_Ewhfs6A" x="-20" y="-15"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_MMsq4UlgEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MMsq4klgEemT5f_Ewhfs6A" points="[882, 458, -643984, -643984]$[822, 458, -643984, -643984]$[822, 398, -643984, -643984]$[882, 398, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NkQ6wElgEemT5f_Ewhfs6A" id="(0.0,0.8455882352941176)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NkQ6wUlgEemT5f_Ewhfs6A" id="(0.0,0.40441176470588236)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_V8cGoElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_V8cGo0lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MC6x4EliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctsElgEemT5f_Ewhfs6A" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_V8ctsUlgEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Mzf6QEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctsklgEemT5f_Ewhfs6A" x="1" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_V8cts0lgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NhHOMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8cttElgEemT5f_Ewhfs6A" x="68" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_V8cttUlgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OIzgUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8cttklgEemT5f_Ewhfs6A" x="-68" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_V8ctt0lgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OwMQcEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctuElgEemT5f_Ewhfs6A" x="14" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_V8ctuUlgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PYowgEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctuklgEemT5f_Ewhfs6A" x="-15" y="25"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_V8cGoUlgEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V8cGoklgEemT5f_Ewhfs6A" points="[1387, 469, -643984, -643984]$[1387, 529, -643984, -643984]$[1187, 529, -643984, -643984]$[1187, 469, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XQGG4ElgEemT5f_Ewhfs6A" id="(0.6982543640897756,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XQGG4UlgEemT5f_Ewhfs6A" id="(0.19950124688279303,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TTeRkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c6RzwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRlEvXEemT5f_Ewhfs6A" x="-65" y="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dYzi0EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRlkvXEemT5f_Ewhfs6A" x="-60" y="11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRl0vXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_d3_ZMEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRmEvXEemT5f_Ewhfs6A" x="72" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRmUvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_eXA3gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRmkvXEemT5f_Ewhfs6A" x="-32" y="60"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRm0vXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_e1NPYEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRnEvXEemT5f_Ewhfs6A" x="15" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRnUvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fTML4EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRnkvXEemT5f_Ewhfs6A" x="-13" y="16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_TTeRkUvXEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TTeRkkvXEemT5f_Ewhfs6A" points="[744, 46, -643984, -643984]$[519, 46, -643984, -643984]$[519, 182, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_URfZAEvXEemT5f_Ewhfs6A" id="(0.0,0.49056603773584906)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_URfZAUvXEemT5f_Ewhfs6A" id="(0.7487562189054726,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_WUpjkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_WUpjk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pu5VwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUpjlEvXEemT5f_Ewhfs6A" x="-24"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WUpjlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qOc_kEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUpjlkvXEemT5f_Ewhfs6A" x="-44" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKoEvXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qscjIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKoUvXEemT5f_Ewhfs6A" x="75" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKokvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_rKWnIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKo0vXEemT5f_Ewhfs6A" x="-75" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKpEvXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_rpMfQEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKpUvXEemT5f_Ewhfs6A" x="75" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKpkvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sHI_gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKp0vXEemT5f_Ewhfs6A" x="-13" y="16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_WUpjkUvXEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WUpjkkvXEemT5f_Ewhfs6A" points="[827, 81, -643984, -643984]$[827, 585, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWKD4EvXEemT5f_Ewhfs6A" id="(0.2846975088967972,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWKD4UvXEemT5f_Ewhfs6A" id="(0.4304461942257218,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_I4JjYEvxEemT5f_Ewhfs6A" type="Abstraction_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_7M57YEvwEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_I4JjY0vxEemT5f_Ewhfs6A" type="Abstraction_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZnfZEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_I4JjZEvxEemT5f_Ewhfs6A" x="-9" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_I4JjZUvxEemT5f_Ewhfs6A" type="Abstraction_StereotypeLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZWNRQEvxEemT5f_Ewhfs6A" source="QualifiedName">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZWNRQUvxEemT5f_Ewhfs6A" key="QualifiedNameDepth" value="2"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteDkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteD0S5Eem_eeeaz1ENMQ" x="73" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvteEES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteEUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteEkS5Eem_eeeaz1ENMQ" x="-53" y="15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvteE0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteFES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteFUS5Eem_eeeaz1ENMQ" x="15" y="14"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvteFkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteF0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteGES5Eem_eeeaz1ENMQ" x="-26" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_YvteGUS5Eem_eeeaz1ENMQ"/>
+      <element href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvteHUS5Eem_eeeaz1ENMQ" points="[543, 577, -643984, -643984]$[543, 374, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvteHkS5Eem_eeeaz1ENMQ" id="(0.7900207900207901,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvteH0S5Eem_eeeaz1ENMQ" id="(0.7985074626865671,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_Yvv6dUS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6dkS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvv6d0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvv6eES5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6eUS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvv6ekS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvv6e0S5Eem_eeeaz1ENMQ" x="2" y="17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6fES5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhAES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhAUS5Eem_eeeaz1ENMQ" x="23" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhAkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhA0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhBES5Eem_eeeaz1ENMQ" x="-23" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhBUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhB0S5Eem_eeeaz1ENMQ" x="24" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhCES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhCkS5Eem_eeeaz1ENMQ" x="-24" y="-18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_YvwhC0S5Eem_eeeaz1ENMQ"/>
+      <element href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvwhDES5Eem_eeeaz1ENMQ" points="[1603, 339, -643984, -643984]$[1603, 409, -643984, -643984]$[1525, 409, -643984, -643984]$[1525, 479, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvwhDUS5Eem_eeeaz1ENMQ" id="(0.425531914893617,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvwhDkS5Eem_eeeaz1ENMQ" id="(0.425531914893617,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_YvxvOkS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_4jT6oE2rEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvO0S5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvPES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvPUS5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvPkS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvP0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvQES5Eem_eeeaz1ENMQ" x="-8" y="70"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvQUS5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvQkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvQ0S5Eem_eeeaz1ENMQ" x="6" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvRES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvRUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvRkS5Eem_eeeaz1ENMQ" x="-6" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvR0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvSES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvSUS5Eem_eeeaz1ENMQ" x="24" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvSkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvS0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvTES5Eem_eeeaz1ENMQ" x="-8" y="-17"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_YvxvTUS5Eem_eeeaz1ENMQ"/>
+      <element href="TapiEquipment.uml#_6B5aoC7BEemaZq0-6SfFXw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvxvTkS5Eem_eeeaz1ENMQ" points="[1143, 102, -643984, -643984]$[1215, 102, -643984, -643984]$[1215, 9, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvxvT0S5Eem_eeeaz1ENMQ" id="(1.0,0.47244094488188976)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvxvUES5Eem_eeeaz1ENMQ" id="(0.4473684210526316,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_QbC-0ElZEemT5f_Ewhfs6A" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_QbC-00lZEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ViYFAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbC-1ElZEemT5f_Ewhfs6A" x="36"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_QbC-1UlZEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WMqYIElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbC-1klZEemT5f_Ewhfs6A" x="16" y="8"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_QbC-10lZEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WztKAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl4ElZEemT5f_Ewhfs6A" x="21" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_QbDl4UlZEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XcyjQElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl4klZEemT5f_Ewhfs6A" x="-21" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_QbDl40lZEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YEElsElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl5ElZEemT5f_Ewhfs6A" x="21" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_QbDl5UlZEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YthyYElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl5klZEemT5f_Ewhfs6A" x="-22" y="-17"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_QbC-0UlZEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_QbC-0klZEemT5f_Ewhfs6A" points="[1247, 130, -643984, -643984]$[1247, 349, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RwuYUElZEemT5f_Ewhfs6A" id="(0.4648910411622276,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RwuYUUlZEemT5f_Ewhfs6A" id="(0.3491271820448878,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_MMsq4ElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_MMsq40lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xz2pUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMsq5ElgEemT5f_Ewhfs6A" x="-14" y="-8"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_MMsq5UlgEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yc0GwEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMsq5klgEemT5f_Ewhfs6A" x="10" y="-6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR8ElgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ZEHXUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR8UlgEemT5f_Ewhfs6A" x="15" y="-82"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR8klgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Zuz6IEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR80lgEemT5f_Ewhfs6A" x="-17" y="-40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR9ElgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_aYUxMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR9UlgEemT5f_Ewhfs6A" x="15" y="-14"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR9klgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bALbYEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR90lgEemT5f_Ewhfs6A" x="-20" y="-15"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_MMsq4UlgEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MMsq4klgEemT5f_Ewhfs6A" points="[882, 458, -643984, -643984]$[822, 458, -643984, -643984]$[822, 398, -643984, -643984]$[882, 398, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NkQ6wElgEemT5f_Ewhfs6A" id="(0.0,0.8455882352941176)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NkQ6wUlgEemT5f_Ewhfs6A" id="(0.0,0.40441176470588236)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_V8cGoElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_V8cGo0lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MC6x4EliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctsElgEemT5f_Ewhfs6A" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_V8ctsUlgEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Mzf6QEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctsklgEemT5f_Ewhfs6A" x="1" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_V8cts0lgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NhHOMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8cttElgEemT5f_Ewhfs6A" x="68" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_V8cttUlgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OIzgUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8cttklgEemT5f_Ewhfs6A" x="-68" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_V8ctt0lgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OwMQcEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctuElgEemT5f_Ewhfs6A" x="14" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_V8ctuUlgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_PYowgEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctuklgEemT5f_Ewhfs6A" x="-15" y="25"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_V8cGoUlgEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_V8cGoklgEemT5f_Ewhfs6A" points="[1387, 469, -643984, -643984]$[1387, 529, -643984, -643984]$[1187, 529, -643984, -643984]$[1187, 469, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XQGG4ElgEemT5f_Ewhfs6A" id="(0.6982543640897756,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XQGG4UlgEemT5f_Ewhfs6A" id="(0.19950124688279303,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_TTeRkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_c6RzwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRlEvXEemT5f_Ewhfs6A" x="-65" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_dYzi0EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRlkvXEemT5f_Ewhfs6A" x="-60" y="11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRl0vXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_d3_ZMEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRmEvXEemT5f_Ewhfs6A" x="72" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRmUvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eXA3gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRmkvXEemT5f_Ewhfs6A" x="-32" y="60"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRm0vXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_e1NPYEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRnEvXEemT5f_Ewhfs6A" x="15" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRnUvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fTML4EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRnkvXEemT5f_Ewhfs6A" x="-13" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_TTeRkUvXEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TTeRkkvXEemT5f_Ewhfs6A" points="[744, 46, -643984, -643984]$[519, 46, -643984, -643984]$[519, 182, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URfZAEvXEemT5f_Ewhfs6A" id="(0.0,0.49056603773584906)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URfZAUvXEemT5f_Ewhfs6A" id="(0.7487562189054726,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_WUpjkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_WUpjk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_pu5VwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUpjlEvXEemT5f_Ewhfs6A" x="-24"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WUpjlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_qOc_kEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUpjlkvXEemT5f_Ewhfs6A" x="-44" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKoEvXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_qscjIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKoUvXEemT5f_Ewhfs6A" x="75" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKokvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_rKWnIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKo0vXEemT5f_Ewhfs6A" x="-75" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKpEvXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_rpMfQEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKpUvXEemT5f_Ewhfs6A" x="75" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKpkvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_sHI_gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKp0vXEemT5f_Ewhfs6A" x="-13" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_WUpjkUvXEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_WUpjkkvXEemT5f_Ewhfs6A" points="[827, 81, -643984, -643984]$[827, 585, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XWKD4EvXEemT5f_Ewhfs6A" id="(0.2846975088967972,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XWKD4UvXEemT5f_Ewhfs6A" id="(0.4304461942257218,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_I4JjYEvxEemT5f_Ewhfs6A" type="Abstraction_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_7M57YEvwEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_I4JjY0vxEemT5f_Ewhfs6A" type="Abstraction_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ZnfZEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_I4JjZEvxEemT5f_Ewhfs6A" x="-9" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_I4JjZUvxEemT5f_Ewhfs6A" type="Abstraction_StereotypeLabel">
+        <eAnnotations xmi:id="_ZWNRQEvxEemT5f_Ewhfs6A" source="QualifiedName">
+          <details xmi:id="_ZWNRQUvxEemT5f_Ewhfs6A" key="QualifiedNameDepth" value="2"/>
         </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aCqSIEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_I4JjZkvxEemT5f_Ewhfs6A" x="-12" y="7"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_I4JjYUvxEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I4JjYkvxEemT5f_Ewhfs6A" points="[1186, -231, -643984, -643984]$[1407, -231, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JsCecEvxEemT5f_Ewhfs6A" id="(1.0,0.35398230088495575)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JsCecUvxEemT5f_Ewhfs6A" id="(0.0,0.4)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__DqVEEvxEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_dOMqwEvWEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__DqVE0vxEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MjcT8EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVFEvxEemT5f_Ewhfs6A" x="-1" y="2"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__DqVFUvxEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_M-LvMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVFkvxEemT5f_Ewhfs6A" x="-18" y="4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__DqVF0vxEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NZUMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVGEvxEemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__DqVGUvxEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_N0vjwEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVGkvxEemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__Dq8IEvxEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OSDx4EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__Dq8IUvxEemT5f_Ewhfs6A" x="8" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__Dq8IkvxEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OsgSMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__Dq8I0vxEemT5f_Ewhfs6A" x="-16" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__DqVEUvxEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__DqVEkvxEemT5f_Ewhfs6A" points="[936, -159, -643984, -643984]$[936, -27, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__6M7gEvxEemT5f_Ewhfs6A" id="(0.09302325581395349,0.9911504424778761)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__6M7gUvxEemT5f_Ewhfs6A" id="(0.6405693950177936,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_DpB9sEvyEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_Yvv6IUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9s0vyEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_adqMEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9tEvyEemT5f_Ewhfs6A" x="-4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9tUvyEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a6aZgEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9tkvyEemT5f_Ewhfs6A" x="-24" y="-8"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9t0vyEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bWB-gEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9uEvyEemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9uUvyEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bxS-MEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9ukvyEemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9u0vyEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cMlMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9vEvyEemT5f_Ewhfs6A" x="24" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9vUvyEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cn5PAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9vkvyEemT5f_Ewhfs6A" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_DpB9sUvyEemT5f_Ewhfs6A"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DpB9skvyEemT5f_Ewhfs6A" points="[1155, -159, -643984, -643984]$[1155, 49, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgApAEvyEemT5f_Ewhfs6A" id="(0.8239202657807309,0.9911504424778761)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgApAUvyEemT5f_Ewhfs6A" id="(0.2711864406779661,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MccoQE2sEemQQPVBE79CWA" type="Abstraction_Edge" source="_4jT6oE2rEemQQPVBE79CWA" target="_Yvur1US5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_MccoQ02sEemQQPVBE79CWA" type="Abstraction_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QmiqIE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MccoRE2sEemQQPVBE79CWA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_McdPUE2sEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Q55rAE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_McdPUU2sEemQQPVBE79CWA" x="-21" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_MccoQU2sEemQQPVBE79CWA"/>
-      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MccoQk2sEemQQPVBE79CWA" points="[1360, 9, -643984, -643984]$[1360, 100, -643984, -643984]$[1371, 100, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDINwE2sEemQQPVBE79CWA" id="(0.7763157894736842,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDINwU2sEemQQPVBE79CWA" id="(0.0,0.42)"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_aCqSIEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_I4JjZkvxEemT5f_Ewhfs6A" x="-12" y="7"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_I4JjYUvxEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_I4JjYkvxEemT5f_Ewhfs6A" points="[1186, -231, -643984, -643984]$[1407, -231, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JsCecEvxEemT5f_Ewhfs6A" id="(1.0,0.35398230088495575)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JsCecUvxEemT5f_Ewhfs6A" id="(0.0,0.4)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__DqVEEvxEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_dOMqwEvWEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__DqVE0vxEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MjcT8EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVFEvxEemT5f_Ewhfs6A" x="-1" y="2"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__DqVFUvxEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_M-LvMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVFkvxEemT5f_Ewhfs6A" x="-18" y="4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__DqVF0vxEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NZUMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVGEvxEemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__DqVGUvxEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_N0vjwEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVGkvxEemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__Dq8IEvxEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OSDx4EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__Dq8IUvxEemT5f_Ewhfs6A" x="8" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__Dq8IkvxEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OsgSMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__Dq8I0vxEemT5f_Ewhfs6A" x="-16" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__DqVEUvxEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__DqVEkvxEemT5f_Ewhfs6A" points="[936, -159, -643984, -643984]$[936, -27, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__6M7gEvxEemT5f_Ewhfs6A" id="(0.09302325581395349,0.9911504424778761)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__6M7gUvxEemT5f_Ewhfs6A" id="(0.6405693950177936,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_DpB9sEvyEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_Yvv6IUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9s0vyEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_adqMEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9tEvyEemT5f_Ewhfs6A" x="-4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9tUvyEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a6aZgEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9tkvyEemT5f_Ewhfs6A" x="-24" y="-8"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9t0vyEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bWB-gEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9uEvyEemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9uUvyEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bxS-MEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9ukvyEemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9u0vyEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cMlMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9vEvyEemT5f_Ewhfs6A" x="24" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9vUvyEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cn5PAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9vkvyEemT5f_Ewhfs6A" x="-13" y="-31"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_DpB9sUvyEemT5f_Ewhfs6A"/>
+      <element href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DpB9skvyEemT5f_Ewhfs6A" points="[1155, -159, -643984, -643984]$[1155, 49, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EgApAEvyEemT5f_Ewhfs6A" id="(0.8239202657807309,0.9911504424778761)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EgApAUvyEemT5f_Ewhfs6A" id="(0.2711864406779661,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_MccoQE2sEemQQPVBE79CWA" type="Abstraction_Edge" source="_4jT6oE2rEemQQPVBE79CWA" target="_Yvur1US5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_MccoQ02sEemQQPVBE79CWA" type="Abstraction_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_QmiqIE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MccoRE2sEemQQPVBE79CWA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_McdPUE2sEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Q55rAE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_McdPUU2sEemQQPVBE79CWA" x="-21" y="-13"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_MccoQU2sEemQQPVBE79CWA"/>
+      <element href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MccoQk2sEemQQPVBE79CWA" points="[1360, 9, -643984, -643984]$[1360, 100, -643984, -643984]$[1371, 100, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDINwE2sEemQQPVBE79CWA" id="(0.7763157894736842,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDINwU2sEemQQPVBE79CWA" id="(0.0,0.42)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Tt3yAE2tEemQQPVBE79CWA" type="Abstraction_Edge" source="_8PgDEE2sEemQQPVBE79CWA" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tt3yA02tEemQQPVBE79CWA" type="Abstraction_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qgo-EHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tt3yBE2tEemQQPVBE79CWA" y="40"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Tt3yAE2tEemQQPVBE79CWA" type="Abstraction_Edge" source="_8PgDEE2sEemQQPVBE79CWA" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Tt3yA02tEemQQPVBE79CWA" type="Abstraction_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_qgo-EHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Tt3yBE2tEemQQPVBE79CWA" y="40"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tt4ZEE2tEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_q04IsHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tt4ZEU2tEemQQPVBE79CWA" x="-60" y="-48"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Tt4ZEE2tEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_q04IsHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Tt4ZEU2tEemQQPVBE79CWA" x="-60" y="-48"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Tt3yAU2tEemQQPVBE79CWA"/>
-      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tt3yAk2tEemQQPVBE79CWA" points="[1444, 633, -643984, -643984]$[1596, 633, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UVCfsE2tEemQQPVBE79CWA" id="(1.0,0.4262295081967213)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UVCfsU2tEemQQPVBE79CWA" id="(0.0,0.45)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Tt3yAU2tEemQQPVBE79CWA"/>
+      <element href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Tt3yAk2tEemQQPVBE79CWA" points="[1444, 633, -643984, -643984]$[1596, 633, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVCfsE2tEemQQPVBE79CWA" id="(1.0,0.4262295081967213)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVCfsU2tEemQQPVBE79CWA" id="(0.0,0.45)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ha4swHstEemfSIWqmJMEQA" type="InterfaceRealization_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_EM33QHspEemfSIWqmJMEQA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ha4sw3stEemfSIWqmJMEQA" type="InterfaceRealization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uOT78HstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ha4sxHstEemfSIWqmJMEQA" x="-1" y="38"/>
+    <edges xsi:type="notation:Connector" xmi:id="_ha4swHstEemfSIWqmJMEQA" type="InterfaceRealization_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_EM33QHspEemfSIWqmJMEQA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ha4sw3stEemfSIWqmJMEQA" type="InterfaceRealization_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_uOT78HstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ha4sxHstEemfSIWqmJMEQA" x="-1" y="38"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ha4sxXstEemfSIWqmJMEQA" type="InterfaceRealization_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uh9QsHstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ha4sxnstEemfSIWqmJMEQA" x="-1" y="58"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ha4sxXstEemfSIWqmJMEQA" type="InterfaceRealization_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_uh9QsHstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ha4sxnstEemfSIWqmJMEQA" x="-1" y="58"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ha4swXstEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:InterfaceRealization" href="TapiEquipment.uml#_g_g_YHstEemfSIWqmJMEQA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ha4swnstEemfSIWqmJMEQA" points="[907, -254, -643984, -643984]$[532, -217, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJKIAHstEemfSIWqmJMEQA" id="(0.0,0.4247787610619469)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJKIAXstEemfSIWqmJMEQA" id="(1.0,0.4419889502762431)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_ha4swXstEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_g_g_YHstEemfSIWqmJMEQA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ha4swnstEemfSIWqmJMEQA" points="[907, -254, -643984, -643984]$[532, -217, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iJKIAHstEemfSIWqmJMEQA" id="(0.0,0.4247787610619469)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iJKIAXstEemfSIWqmJMEQA" id="(1.0,0.4419889502762431)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l0TgJHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Yvs210S5Eem_eeeaz1ENMQ" target="_l0TgIHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l0TgJXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l0TgKXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UNnXEKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvs210S5Eem_eeeaz1ENMQ" target="_UNmwAKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UNnXEaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UNnXFaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l0TgJnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l0TgJ3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l0TgKHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UNnXEqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNnXE6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNnXFKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l0rTlHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_l0rTkHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l0rTlXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l0rTmXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UOLXwaawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_UOKwsKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UOLXwqawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UOLXxqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l0rTlnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l0rTl3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l0rTmHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UOLXw6awEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UOLXxKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UOLXxaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l1M4BHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_l1M4AHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l1M4BXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l1M4CXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UO5whKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_UO5wgKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UO5whaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UO5wiaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l1M4Bnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l1M4B3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l1M4CHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UO5whqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UO5wh6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UO5wiKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l2OLtHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Yvs2o0S5Eem_eeeaz1ENMQ" target="_l2OLsHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l2OLtXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l2OLuXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UQK71KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvs2o0S5Eem_eeeaz1ENMQ" target="_UQK70KawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UQK71aawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQK72aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l2OLtnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l2OLt3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l2OLuHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UQK71qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQK716awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQK72KawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l2nNRHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_l2nNQHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l2nNRXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l2nNSXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UQ57pKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_UQ57oKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UQ57paawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQ57qaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l2nNRnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l2nNR3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l2nNSHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UQ57pqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQ57p6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQ57qKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l3IKpHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_YvtdsES5Eem_eeeaz1ENMQ" target="_l3IKoHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l3IKpXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l3IKqXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_URtz9KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvtdsES5Eem_eeeaz1ENMQ" target="_URtz8KawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_URtz9aawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_URubAqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l3IKpnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l3IKp3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l3IKqHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_URtz9qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URubAKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URubAaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l3QthHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_QbC-0ElZEemT5f_Ewhfs6A" target="_l3QtgHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l3QthXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l3RUkHh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UR6oRKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QbC-0ElZEemT5f_Ewhfs6A" target="_UR6oQKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UR6oRaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UR6oSaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l3Qthnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l3Qth3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l3QtiHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UR6oRqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UR6oR6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UR6oSKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l3pvFHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_l3pvEHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l3pvFXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l3pvGXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UShFNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_UShFMKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UShFNaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UShsQqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l3pvFnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l3pvF3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l3pvGHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UShFNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UShsQKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UShsQaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l4NvxHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_YvteBES5Eem_eeeaz1ENMQ" target="_l4NvwHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l4NvxXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l4NvyXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UTjnBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvteBES5Eem_eeeaz1ENMQ" target="_UTjnAKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UTjnBaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UTjnCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l4Nvxnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4Nvx3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4NvyHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UTjnBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UTjnB6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UTjnCKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l4mxUXh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_l4mKQHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l4mxUnh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l4mxVnh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UUVqJKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_UUVqIKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UUVqJaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UUVqKaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l4mxU3h9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4mxVHh9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4mxVXh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UUVqJqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UUVqJ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UUVqKKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l5WYNHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_l5WYMHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l5WYNXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l5WYOXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UVv_ZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_UVv_YKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UVv_ZaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UVv_aaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l5WYNnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5WYN3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5WYOHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UVv_ZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVv_Z6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVv_aKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l5_RZHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_MMsq4ElgEemT5f_Ewhfs6A" target="_l5_RYHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l5_RZXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l5_RaXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UW7EFKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MMsq4ElgEemT5f_Ewhfs6A" target="_UW7EEKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UW7EFaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UW7EGaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l5_RZnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5_RZ3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5_RaHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UW7EFqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UW7EF6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UW7EGKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l6EJ5Hh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_V8cGoElgEemT5f_Ewhfs6A" target="_l6EJ4Hh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l6EJ5Xh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l6EJ6Xh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UXE1E6awEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_V8cGoElgEemT5f_Ewhfs6A" target="_UXEOAKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UXE1FKawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXE1GKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6EJ5nh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6EJ53h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6EJ6Hh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UXE1FaawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXE1FqawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXE1F6awEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l6dLdHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_l6dLcHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l6dLdXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l6dLeXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UXtHNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_UXtHMKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UXtHNaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXtuQqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6dLdnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6dLd3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6dLeHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UXtHNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXtuQKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXtuQaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l6-v5Hh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_TTeRkEvXEemT5f_Ewhfs6A" target="_l6-v4Hh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l6-v5Xh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l6-v6Xh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UYi0tKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_TTeRkEvXEemT5f_Ewhfs6A" target="_UYi0sKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UYi0taawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYi0uaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6-v5nh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6-v53h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6-v6Hh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UYi0tqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYi0t6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYi0uKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l7FdlHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_WUpjkEvXEemT5f_Ewhfs6A" target="_l7FdkHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l7FdlXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l7FdmXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UYsltKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WUpjkEvXEemT5f_Ewhfs6A" target="_UYslsKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UYsltaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYsluaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l7Fdlnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7Fdl3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7FdmHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UYsltqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYslt6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYsluKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l7a0wXh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_l7aNsHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l7a0wnh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l7a0xnh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UZPYQKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_UZOxMKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UZPYQaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UZPYRaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l7a0w3h9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7a0xHh9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7a0xXh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UZPYQqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UZPYQ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UZPYRKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l75V4Hh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_I4JjYEvxEemT5f_Ewhfs6A" target="_l74u0Hh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l75V4Xh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l75V5Xh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UaCCcaawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_I4JjYEvxEemT5f_Ewhfs6A" target="_UaBbYKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UaCCcqawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaCCdqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l75V4nh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l75V43h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l75V5Hh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UaCCc6awEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaCCdKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaCCdaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l7_cgXh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="__DqVEEvxEemT5f_Ewhfs6A" target="_l7-1cHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l7_cgnh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l7_chnh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UaLMZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__DqVEEvxEemT5f_Ewhfs6A" target="_UaLMYKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UaLMZaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaLMaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l7_cg3h9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7_chHh9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7_chXh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UaLMZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaLMZ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaLMaKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l8GxRHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_DpB9sEvyEemT5f_Ewhfs6A" target="_l8GxQHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l8GxRXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l8GxSXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UaVkdKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DpB9sEvyEemT5f_Ewhfs6A" target="_UaVkcKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UaVkdaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaVkeaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l8GxRnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l8GxR3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l8GxSHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UaVkdqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaVkd6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaVkeKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l8fy0Xh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_7M57YEvwEemT5f_Ewhfs6A" target="_l8fLwHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l8fy0nh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l8fy1nh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Ua8BZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7M57YEvwEemT5f_Ewhfs6A" target="_Ua8BYKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Ua8BZaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ua8BaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l8fy03h9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l8fy1Hh9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l8fy1Xh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ua8BZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ua8BZ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ua8BaKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l840ZHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_4jT6oE2rEemQQPVBE79CWA" target="_l840YHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l840ZXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l840aXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UbpMBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4jT6oE2rEemQQPVBE79CWA" target="_UbpMAKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UbpMBaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UbpMCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l840Znh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l840Z3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l840aHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UbpMBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UbpMB6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UbpMCKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l9FotHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_MccoQE2sEemQQPVBE79CWA" target="_l9FosHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l9FotXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9FouXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Ub98JKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MccoQE2sEemQQPVBE79CWA" target="_Ub98IKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Ub98JaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ub98KaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l9Fotnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9Fot3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9FouHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ub98JqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ub98J6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ub98KKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l9U5RHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_8PgDEE2sEemQQPVBE79CWA" target="_l9U5QHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l9U5RXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9U5SXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UcWWpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8PgDEE2sEemQQPVBE79CWA" target="_UcWWoKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UcWWpaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcWWqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l9U5Rnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9U5R3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9U5SHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UcWWpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcWWp6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcWWqKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l9hGhHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_Tt3yAE2tEemQQPVBE79CWA" target="_l9hGgHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l9hGhXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9hGiXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UcuKFKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Tt3yAE2tEemQQPVBE79CWA" target="_UcuKEKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_UcuKFaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcuKGaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l9hGhnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9hGh3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9hGiHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UcuKFqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcuKF6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcuKGKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l9pCVHh9EeqVN_GB3rPx7g" type="StereotypeCommentLink" source="_EM33QHspEemfSIWqmJMEQA" target="_l9pCUHh9EeqVN_GB3rPx7g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_l9pCVXh9EeqVN_GB3rPx7g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l9pCWXh9EeqVN_GB3rPx7g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Uc6-ZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EM33QHspEemfSIWqmJMEQA" target="_Uc6-YKawEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Uc6-ZaawEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Uc6-aaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l9pCVnh9EeqVN_GB3rPx7g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9pCV3h9EeqVN_GB3rPx7g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l9pCWHh9EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Uc6-ZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uc6-Z6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uc6-aKawEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_pUoawHsuEemfSIWqmJMEQA">
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_A84FcBgpEem7b6CPWW1OrA" path="/TapiModel/UmlProfiles/ClassDiagramStyleSheet.css"/>
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_A84sgBgpEem7b6CPWW1OrA" path="/TapiModel/TapiClassDiagram.css"/>
+    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_A84FcBgpEem7b6CPWW1OrA" path="/TapiModel/UmlProfiles/ClassDiagramStyleSheet.css"/>
+    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_A84sgBgpEem7b6CPWW1OrA" path="/TapiModel/TapiClassDiagram.css"/>
   </css:ModelStyleSheets>
   <notation:Diagram xmi:id="_4c8y0HswEemfSIWqmJMEQA" type="PapyrusUMLClassDiagram" name="EquipmentDataTypes" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_Ud59KXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="13420443">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59KnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud59K3sxEemfSIWqmJMEQA" x="-610" y="-128" width="340" height="20"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Ud5-pXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-pnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-p3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-qHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ud5-qXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_Ud5-qnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_r240kERLEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-3HsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ud5-3XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-1CEIERMEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5_D3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ud5_EHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_l6LE4ERTEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5_QnsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ud5_Q3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Ud5_RHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ud5_RXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud5_RnsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ud5_R3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ud5_SHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Ud5_SXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ud5_SnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud5_S3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud5_WnsxEemfSIWqmJMEQA" x="-158" y="842" width="321" height="121"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDG_3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDHAHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDHAXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHAnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDHA3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDHBHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_3ypNAEQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHNnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDHN3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_cC-A8EQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHaXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDHansxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VTQLMEQtEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHnHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDHnXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_uHNXkEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHz3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDH0HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-5svQEQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIAnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDIA3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_j105QEQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDINXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDINnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_mig3EEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIaHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDIaXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDIansxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDIa3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDIbHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDIbXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDIbnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDIb3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDIcHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDIcXsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDIgHsxEemfSIWqmJMEQA" x="-178" y="390" width="341" height="181"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDInHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDInXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDInnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIn3sxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDIoHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDIoXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_h6N5gEvMEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDI03sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDI1HsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDI1XsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDI1nsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDI13sxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDI2HsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDI2XsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDI2nsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDI23sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDI3HsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDI63sxEemfSIWqmJMEQA" x="-18" y="670" width="441"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDI7HsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDI7XsxEemfSIWqmJMEQA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDI7nsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDI73sxEemfSIWqmJMEQA" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDI8HsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeDI8XsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeDI8nsxEemfSIWqmJMEQA" key="visible" value="true"/>
+    <children xsi:type="notation:Shape" xmi:id="_Ud59KXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="13420443">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59KnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud59K3sxEemfSIWqmJMEQA" x="-610" y="-128" width="340" height="20"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Ud5-pXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-pnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-p3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-qHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Ud5-qXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Ud5-qnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_r240kERLEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-3HsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ud5-3XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_-1CEIERMEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5_D3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ud5_EHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_l6LE4ERTEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5_QnsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Ud5_Q3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Ud5_RHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Ud5_RXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud5_RnsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Ud5_R3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Ud5_SHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Ud5_SXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Ud5_SnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud5_S3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud5_WnsxEemfSIWqmJMEQA" x="-158" y="842" width="321" height="121"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDG_3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDHAHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDHAXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHAnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDHA3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDHBHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_3ypNAEQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHNnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDHN3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_cC-A8EQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHaXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDHansxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_VTQLMEQtEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHnHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDHnXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_uHNXkEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHz3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDH0HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_-5svQEQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIAnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDIA3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_j105QEQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDINXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDINnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_mig3EEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIaHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDIaXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDIansxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDIa3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDIbHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDIbXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDIbnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDIb3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDIcHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDIcXsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDIgHsxEemfSIWqmJMEQA" x="-178" y="390" width="341" height="181"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDInHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDInXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDInnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIn3sxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDIoHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDIoXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_h6N5gEvMEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDI03sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDI1HsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDI1XsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDI1nsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDI13sxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDI2HsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDI2XsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDI2nsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDI23sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDI3HsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDI63sxEemfSIWqmJMEQA" x="-18" y="670" width="441"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDI7HsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDI7XsxEemfSIWqmJMEQA" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDI7nsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDI73sxEemfSIWqmJMEQA" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDI8HsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_UeDI8XsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+          <details xmi:id="_UeDI8nsxEemfSIWqmJMEQA" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_UeDI83sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJJXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDJJnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJWHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDJWXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJi3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDJjHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJvnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDJv3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJ6nsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDJ63sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKHXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDKHnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKUHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDKUXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKfHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDKfXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKqHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDKqXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDKqnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDKq3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDKrHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDKrXsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDKrnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDKr3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDKsHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDKsXsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDKsnsxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDKs3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDKtHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDKtXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDKtnsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDK63sxEemfSIWqmJMEQA" x="670" y="-10" width="402" height="193"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDK7HsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDK7XsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDK7nsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDK73sxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDK8HsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDK8XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_LUifYkvHEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLI3sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDLJHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDLJXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDLJnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDLJ3sxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDLKHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDLKXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDLKnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDLK3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDLLHsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDLO3sxEemfSIWqmJMEQA" x="342" y="430" width="480"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDLVXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLVnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLV3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLWHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDLWXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDLWnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_y1arcD9MEemsT7Uwjmld0w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLjHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDLjXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D-nvgDmkEemDl_QGWIY6yg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLv3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDLwHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VlGeADmkEemDl_QGWIY6yg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDL8nsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_DfpPAHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_kGNzEG27Eeqjr-4srHPKHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_DfpPAXh7EeqVN_GB3rPx7g"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDL83sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDL9HsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDL9XsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDL9nsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDL93sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDL-HsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDL-XsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDL-nsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDL-3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDMCnsxEemfSIWqmJMEQA" x="679" y="-211" width="341" height="121"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDNansxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNa3sxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDNbHsxEemfSIWqmJMEQA" x="-607" y="-251" width="341" height="21"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDNg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNhnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDNh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDNiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_1yD_8EvHEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNunsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDNu3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_8L2MgEvHEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDN7XsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDN7nsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_AOW_sEvIEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOIHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOIXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOInsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOI3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOJHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOJXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOJnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOJ3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOKHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOKXsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOOHsxEemfSIWqmJMEQA" x="-558" y="210" width="521" height="121"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDOXHsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOXXsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_pNRy8DmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOXnsxEemfSIWqmJMEQA" x="-610" y="-168" width="341" height="21"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDOX3sxEemfSIWqmJMEQA" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOYHsxEemfSIWqmJMEQA" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOYXsxEemfSIWqmJMEQA" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOYnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOY3sxEemfSIWqmJMEQA" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDOZHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_Xh07QFojEemu443YKSGnxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOZXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDOZnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_hywYgFojEemu443YKSGnxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOZ3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDOaHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_jaS-EFojEemu443YKSGnxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOaXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDOansxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_kYMJsFojEemu443YKSGnxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOa3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDObHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_Y_ImwFojEemu443YKSGnxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDObXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDObnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_bG_EEFojEemu443YKSGnxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOb3sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOcHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOcXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOcnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOc3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOgnsxEemfSIWqmJMEQA" x="23" y="-122"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDOg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOhnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeDOiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_PY9k0EvMEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOunsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOu3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOvHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOvXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOvnsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOv3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOwHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOwXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOwnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOw3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDO0nsxEemfSIWqmJMEQA" x="-458" y="670"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeDO3nsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO33sxEemfSIWqmJMEQA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO4HsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDO4XsxEemfSIWqmJMEQA" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDO4nsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeDO43sxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeDO5HsxEemfSIWqmJMEQA" key="visible" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="_UeDI83sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJJXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDJJnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJWHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDJWXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJi3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDJjHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJvnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDJv3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJ6nsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDJ63sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKHXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDKHnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKUHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDKUXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKfHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDKfXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKqHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDKqXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDKqnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDKq3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDKrHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDKrXsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDKrnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDKr3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDKsHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDKsXsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDKsnsxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDKs3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDKtHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDKtXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDKtnsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDK63sxEemfSIWqmJMEQA" x="670" y="-10" width="402" height="193"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDK7HsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDK7XsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDK7nsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDK73sxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDK8HsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDK8XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_LUifYkvHEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLI3sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDLJHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDLJXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDLJnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDLJ3sxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDLKHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDLKXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDLKnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDLK3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDLLHsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDLO3sxEemfSIWqmJMEQA" x="342" y="430" width="480"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDLVXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLVnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLV3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLWHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDLWXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDLWnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_y1arcD9MEemsT7Uwjmld0w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLjHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDLjXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_D-nvgDmkEemDl_QGWIY6yg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLv3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDLwHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_VlGeADmkEemDl_QGWIY6yg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDL8nsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_DfpPAHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_kGNzEG27Eeqjr-4srHPKHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_DfpPAXh7EeqVN_GB3rPx7g"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDL83sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDL9HsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDL9XsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDL9nsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDL93sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDL-HsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDL-XsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDL-nsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDL-3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDMCnsxEemfSIWqmJMEQA" x="679" y="-211" width="341" height="121"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDNansxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNa3sxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDNbHsxEemfSIWqmJMEQA" x="-607" y="-251" width="341" height="21"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDNg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNhnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDNh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDNiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_1yD_8EvHEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNunsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDNu3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_8L2MgEvHEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDN7XsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDN7nsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_AOW_sEvIEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOIHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOIXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOInsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOI3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOJHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOJXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOJnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOJ3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOKHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOKXsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOOHsxEemfSIWqmJMEQA" x="-558" y="210" width="521" height="121"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDOXHsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOXXsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_pNRy8DmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOXnsxEemfSIWqmJMEQA" x="-610" y="-168" width="341" height="21"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDOX3sxEemfSIWqmJMEQA" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOYHsxEemfSIWqmJMEQA" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOYXsxEemfSIWqmJMEQA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOYnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOY3sxEemfSIWqmJMEQA" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDOZHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiEquipment.uml#_Xh07QFojEemu443YKSGnxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOZXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDOZnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiEquipment.uml#_hywYgFojEemu443YKSGnxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOZ3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDOaHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiEquipment.uml#_jaS-EFojEemu443YKSGnxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOaXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDOansxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiEquipment.uml#_kYMJsFojEemu443YKSGnxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOa3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDObHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiEquipment.uml#_Y_ImwFojEemu443YKSGnxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDObXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDObnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiEquipment.uml#_bG_EEFojEemu443YKSGnxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOb3sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOcHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOcXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOcnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOc3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOgnsxEemfSIWqmJMEQA" x="-140" y="-200"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDOg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOhnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeDOiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_PY9k0EvMEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOunsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOu3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOvHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOvXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOvnsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOv3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOwHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOwXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOwnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOw3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDO0nsxEemfSIWqmJMEQA" x="-458" y="670"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeDO3nsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO33sxEemfSIWqmJMEQA" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO4HsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDO4XsxEemfSIWqmJMEQA" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDO4nsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
+        <eAnnotations xmi:id="_UeDO43sxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+          <details xmi:id="_UeDO5HsxEemfSIWqmJMEQA" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_UeDO5XsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPF3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDPGHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPSnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDPS3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPfXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDPfnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPqXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeDPqnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDP1XsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDP1nsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDP13sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDP2HsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDP2XsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDP2nsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDP23sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDP3HsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDP3XsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDP3nsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDP33sxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDP4HsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDP4XsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDP4nsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDP43sxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDQGHsxEemfSIWqmJMEQA" x="670" y="570" width="400" height="120"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeM3eXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM3ensxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM3e3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM3fHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM3fXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeM3fnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_yWCIcEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM3sHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM3sXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Q9fSkEQyEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM343sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM35HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_YrPlQEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4FnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM4F3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_cpqioEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4SXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM4SnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Vlnd0EQ-EeasL6dcjI1vEA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4fHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM4fXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM4fnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM4f3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM4gHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM4gXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM4gnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM4g3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM4hHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM4hXsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM4lHsxEemfSIWqmJMEQA" x="-507" y="-33" width="341" height="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeM4lXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM4lnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM4l3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4mHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM4mXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeM4mnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Jl-hQEvGEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4zHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM4zXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_djFI4EvGEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4_3sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM5AHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM5AXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM5AnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM5A3sxEemfSIWqmJMEQA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM5BHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM5BXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM5BnsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM5B3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM5CHsxEemfSIWqmJMEQA"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM5F3sxEemfSIWqmJMEQA" x="-731" y="445" width="481" height="101"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeM5bHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM5bXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM5bnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM5b3sxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM5cHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_UeM5cXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_5CPsaUvJEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM5o3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM5pHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_5CPsYkvJEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM51nsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UeM513sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeM52HsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM52XsxEemfSIWqmJMEQA" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM52nsxEemfSIWqmJMEQA" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM523sxEemfSIWqmJMEQA" key="italic" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM53HsxEemfSIWqmJMEQA" key="fontColor" value="true"/>
+        <children xsi:type="notation:Shape" xmi:id="_UeDO5XsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPF3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDPGHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPSnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDPS3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPfXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDPfnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPqXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeDPqnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDP1XsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDP1nsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDP13sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDP2HsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDP2XsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDP2nsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDP23sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDP3HsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDP3XsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDP3nsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDP33sxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDP4HsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDP4XsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDP4nsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDP43sxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDQGHsxEemfSIWqmJMEQA" x="670" y="570" width="400" height="120"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeM3eXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM3ensxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM3e3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM3fHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM3fXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeM3fnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_yWCIcEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM3sHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM3sXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_Q9fSkEQyEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM343sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM35HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_YrPlQEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4FnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM4F3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_cpqioEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4SXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM4SnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_Vlnd0EQ-EeasL6dcjI1vEA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4fHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM4fXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM4fnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM4f3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM4gHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM4gXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM4gnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM4g3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM4hHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM4hXsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM4lHsxEemfSIWqmJMEQA" x="-507" y="-33" width="341" height="141"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeM4lXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM4lnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM4l3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4mHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM4mXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeM4mnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_Jl-hQEvGEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4zHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM4zXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_djFI4EvGEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4_3sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM5AHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM5AXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM5AnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM5A3sxEemfSIWqmJMEQA"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM5BHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM5BXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM5BnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM5B3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM5CHsxEemfSIWqmJMEQA"/>
+      </children>
+      <element href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM5F3sxEemfSIWqmJMEQA" x="-731" y="445" width="481" height="101"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_UeM5bHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM5bXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM5bnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM5b3sxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM5cHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_UeM5cXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_5CPsaUvJEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM5o3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM5pHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_5CPsYkvJEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM51nsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UeM513sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel" fontName="Segoe UI">
+          <eAnnotations xmi:id="_UeM52HsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+            <details xmi:id="_UeM52XsxEemfSIWqmJMEQA" key="fontHeight" value="true"/>
+            <details xmi:id="_UeM52nsxEemfSIWqmJMEQA" key="bold" value="true"/>
+            <details xmi:id="_UeM523sxEemfSIWqmJMEQA" key="italic" value="true"/>
+            <details xmi:id="_UeM53HsxEemfSIWqmJMEQA" key="fontColor" value="true"/>
           </eAnnotations>
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_5CPsZUvJEemT5f_Ewhfs6A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM6DnsxEemfSIWqmJMEQA"/>
+          <element href="TapiEquipment.uml#_5CPsZUvJEemT5f_Ewhfs6A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM6DnsxEemfSIWqmJMEQA"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM6D3sxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM6EHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM6EXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6EnsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM6D3sxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM6EHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM6EXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6EnsxEemfSIWqmJMEQA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM6E3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM6FHsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM6FXsxEemfSIWqmJMEQA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM6FnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6F3sxEemfSIWqmJMEQA"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM6E3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM6FHsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM6FXsxEemfSIWqmJMEQA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM6FnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6F3sxEemfSIWqmJMEQA"/>
       </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6JnsxEemfSIWqmJMEQA" x="-18" y="210" width="541" height="121"/>
+      <element href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6JnsxEemfSIWqmJMEQA" x="-18" y="210" width="541" height="121"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_UeM6QXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="12632256">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM6QnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6Q3sxEemfSIWqmJMEQA" x="-607" y="-211" width="341" height="21"/>
+    <children xsi:type="notation:Shape" xmi:id="_UeM6QXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="12632256">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM6QnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6Q3sxEemfSIWqmJMEQA" x="-607" y="-211" width="341" height="21"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_GLtMoHh7EeqVN_GB3rPx7g" type="DataType_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_GLtzsHh7EeqVN_GB3rPx7g" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GLtzsXh7EeqVN_GB3rPx7g" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GLtzsnh7EeqVN_GB3rPx7g" y="15"/>
+    <children xsi:type="notation:Shape" xmi:id="_GLtMoHh7EeqVN_GB3rPx7g" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_GLtzsHh7EeqVN_GB3rPx7g" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_GLtzsXh7EeqVN_GB3rPx7g" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_GLtzsnh7EeqVN_GB3rPx7g" y="15"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_GLuawHh7EeqVN_GB3rPx7g" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_JYc1cHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_FDES0G21Eeqjr-4srHPKHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JYc1cXh7EeqVN_GB3rPx7g"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_GLuawHh7EeqVN_GB3rPx7g" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_JYc1cHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_FDES0G21Eeqjr-4srHPKHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_JYc1cXh7EeqVN_GB3rPx7g"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_JYdcgHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_bZrIcG21Eeqjr-4srHPKHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JYdcgXh7EeqVN_GB3rPx7g"/>
+        <children xsi:type="notation:Shape" xmi:id="_JYdcgHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_bZrIcG21Eeqjr-4srHPKHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_JYdcgXh7EeqVN_GB3rPx7g"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_JYeDkHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiEquipment.uml#_mPn-UG21Eeqjr-4srHPKHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JYeDkXh7EeqVN_GB3rPx7g"/>
+        <children xsi:type="notation:Shape" xmi:id="_JYeDkHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element href="TapiEquipment.uml#_mPn-UG21Eeqjr-4srHPKHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_JYeDkXh7EeqVN_GB3rPx7g"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_GLuawXh7EeqVN_GB3rPx7g"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_GLuawnh7EeqVN_GB3rPx7g"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GLuaw3h7EeqVN_GB3rPx7g"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GLuaxHh7EeqVN_GB3rPx7g"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_GLuawXh7EeqVN_GB3rPx7g"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_GLuawnh7EeqVN_GB3rPx7g"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_GLuaw3h7EeqVN_GB3rPx7g"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GLuaxHh7EeqVN_GB3rPx7g"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_GLuaxXh7EeqVN_GB3rPx7g" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_GLuaxnh7EeqVN_GB3rPx7g"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_GLuax3h7EeqVN_GB3rPx7g"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GLuayHh7EeqVN_GB3rPx7g"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GLuayXh7EeqVN_GB3rPx7g"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_GLuaxXh7EeqVN_GB3rPx7g" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_GLuaxnh7EeqVN_GB3rPx7g"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_GLuax3h7EeqVN_GB3rPx7g"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_GLuayHh7EeqVN_GB3rPx7g"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GLuayXh7EeqVN_GB3rPx7g"/>
       </children>
-      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GLtMoXh7EeqVN_GB3rPx7g" x="260" y="-220"/>
+      <element href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GLtMoXh7EeqVN_GB3rPx7g" x="260" y="-220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XWSDgHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XWSDgXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XWSDg3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o3Dq0KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o3Dq0aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3Dq06axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XWSDgnpCEeq5cO49XpLuJQ" x="42" y="842"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o3Dq0qaxEeqJcvXkREZ1XQ" x="42" y="842"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XWrsIHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XWrsIXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XWrsI3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o3r88KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o3r88aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3r886axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XWrsInpCEeq5cO49XpLuJQ" x="22" y="390"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o3r88qaxEeqJcvXkREZ1XQ" x="22" y="390"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XXgykHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XXgykXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XXgyk3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o4zXQKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o4zXQaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o4zXQ6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XXgyknpCEeq5cO49XpLuJQ" x="182" y="670"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o4zXQqaxEeqJcvXkREZ1XQ" x="182" y="670"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XYAh0HpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XYAh0XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XYAh03pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_o5pEwKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o5pEwaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o5pEw6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XYAh0npCEeq5cO49XpLuJQ" x="870" y="-10"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o5pEwqaxEeqJcvXkREZ1XQ" x="870" y="-10"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XY5SoHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XY5SoXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XY5So3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_o7PnQKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o7PnQaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7PnQ6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XY5SonpCEeq5cO49XpLuJQ" x="870" y="-110"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o7PnQqaxEeqJcvXkREZ1XQ" x="870" y="-110"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XZBOcHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XZBOcXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XZBOc3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o7Z_UKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o7Z_UaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7Z_U6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XZBOcnpCEeq5cO49XpLuJQ" x="542" y="430"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o7Z_UqaxEeqJcvXkREZ1XQ" x="542" y="430"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XZPQ4HpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XZPQ4XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XZPQ43pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
+    <children xsi:type="notation:Shape" xmi:id="_o7vWgKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o7vWgaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7vWg6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XZPQ4npCEeq5cO49XpLuJQ" x="879" y="-211"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o7vWgqaxEeqJcvXkREZ1XQ" x="879" y="-211"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XZsj4HpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XZsj4XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XZsj43pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o8j14KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o8j14aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o8j146axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XZsj4npCEeq5cO49XpLuJQ" x="-358" y="210"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o8j14qaxEeqJcvXkREZ1XQ" x="-358" y="210"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XaIBsHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XaIBsXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XaIBs3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_o9JrwKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o9JrwaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9KS0KaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XaIBsnpCEeq5cO49XpLuJQ" x="223" y="-122"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o9JrwqaxEeqJcvXkREZ1XQ" x="223" y="-122"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XaRysHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XaRysXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XaRys3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o9WgEKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o9WgEaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9XHIKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XaRysnpCEeq5cO49XpLuJQ" x="-258" y="670"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o9WgEqaxEeqJcvXkREZ1XQ" x="-258" y="670"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xaxh8HpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xaxh8XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XayJAHpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_o-P38KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o-QfAKaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o-QfAqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xaxh8npCEeq5cO49XpLuJQ" x="870" y="570"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o-QfAaaxEeqJcvXkREZ1XQ" x="870" y="570"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XbbpQHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XbbpQXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XbbpQ3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <children xsi:type="notation:Shape" xmi:id="_o_FlcKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o_FlcaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_Flc6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XbbpQnpCEeq5cO49XpLuJQ" x="870" y="470"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o_FlcqaxEeqJcvXkREZ1XQ" x="870" y="470"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XbmoYHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XbmoYXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XbmoY3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_o_U2AKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_o_U2AaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_U2A6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XbmoYnpCEeq5cO49XpLuJQ" x="-307" y="-33"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o_U2AqaxEeqJcvXkREZ1XQ" x="-307" y="-33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XcIM0HpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_XcIM0XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XcIM03pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_pAEc4KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_pAEc4aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAFD8KaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XcIM0npCEeq5cO49XpLuJQ" x="-531" y="445"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pAEc4qaxEeqJcvXkREZ1XQ" x="-531" y="445"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xcbu0HpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xcbu0XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xcbu03pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
+    <children xsi:type="notation:Shape" xmi:id="_pAhv4KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_pAhv4aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAhv46axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xcbu0npCEeq5cO49XpLuJQ" x="182" y="210"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pAhv4qaxEeqJcvXkREZ1XQ" x="182" y="210"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Xc1XcHpCEeq5cO49XpLuJQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Xc1XcXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xc1Xc3pCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
+    <children xsi:type="notation:Shape" xmi:id="_pBKCAKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_pBKCAaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pBKpEKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xc1XcnpCEeq5cO49XpLuJQ" x="460" y="-220"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pBKCAqaxEeqJcvXkREZ1XQ" x="460" y="-220"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_4c8y0XswEemfSIWqmJMEQA" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_4c8y0nswEemfSIWqmJMEQA"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_4c8y03swEemfSIWqmJMEQA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_4c8y0XswEemfSIWqmJMEQA" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_4c8y0nswEemfSIWqmJMEQA"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_4c8y03swEemfSIWqmJMEQA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_Ud59LHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59LXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59LnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59L3sxEemfSIWqmJMEQA" x="1" y="37"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59MHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59MXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59MnsxEemfSIWqmJMEQA" x="-4" y="-56"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Ud59M3sxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_4VIVcEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ud59NHsxEemfSIWqmJMEQA" points="[-278, 331, -643984, -643984]$[-278, 423, -643984, -643984]$[-178, 423, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59NXsxEemfSIWqmJMEQA" id="(0.5374280230326296,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59NnsxEemfSIWqmJMEQA" id="(0.0,0.18232044198895028)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Ud59VHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDNg3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59VXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59VnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59V3sxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59WHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59WXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59WnsxEemfSIWqmJMEQA" x="-142" y="8"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Ud59W3sxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_DjvGcEvQEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ud59XHsxEemfSIWqmJMEQA" points="[670, 55, -643984, -643984]$[-123, 55, -643984, -643984]$[-123, 210, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59XXsxEemfSIWqmJMEQA" id="(0.0,0.33678756476683935)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59XnsxEemfSIWqmJMEQA" id="(0.8330134357005758,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Ud5-jHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDK7HsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-jXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud5-jnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-j3sxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-kHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud5-kXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-knsxEemfSIWqmJMEQA" x="46" y="5"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Ud5-k3sxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_-4yPsEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ud5-lHsxEemfSIWqmJMEQA" points="[523, 262, -643984, -643984]$[602, 262, -643984, -643984]$[602, 430, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud5-lXsxEemfSIWqmJMEQA" id="(1.0,0.4132231404958678)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud5-lnsxEemfSIWqmJMEQA" id="(0.5416666666666666,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDIkXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDIknsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDIk3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIlHsxEemfSIWqmJMEQA" x="13" y="5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDIlXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDIlnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIl3sxEemfSIWqmJMEQA" x="8" y="-4"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDImHsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_nll2AEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDImXsxEemfSIWqmJMEQA" points="[-340, 200, -643984, -643984]$[-340, 96, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDImnsxEemfSIWqmJMEQA" id="(0.43761996161228406,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDIm3sxEemfSIWqmJMEQA" id="(0.5190615835777126,0.9858156028368794)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDLPHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDInHsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLPXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDLPnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLP3sxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLQHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDLQXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLQnsxEemfSIWqmJMEQA" x="152" y="-14"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDLQ3sxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_Zkij0EvTEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDLRHsxEemfSIWqmJMEQA" points="[670, 613, -643984, -643984]$[261, 613, -643984, -643984]$[261, 670, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDLRXsxEemfSIWqmJMEQA" id="(0.0,0.35833333333333334)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDLRnsxEemfSIWqmJMEQA" id="(0.6349206349206349,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDMC3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeM5bHsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMDHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMDXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMDnsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMD3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMEHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMEXsxEemfSIWqmJMEQA" x="59" y="11"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDMEnsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_Aez84EvQEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDME3sxEemfSIWqmJMEQA" points="[670, 118, -643984, -643984]$[262, 118, -643984, -643984]$[262, 210, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMFHsxEemfSIWqmJMEQA" id="(0.0,0.6632124352331606)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMFXsxEemfSIWqmJMEQA" id="(0.5175600739371534,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDMM3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMNHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMNXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMNnsxEemfSIWqmJMEQA" x="1" y="37"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMN3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMOHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMOXsxEemfSIWqmJMEQA" x="-73" y="5"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDMOnsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_HS8_oEvPEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDMO3sxEemfSIWqmJMEQA" points="[261, 331, -643984, -643984]$[261, 432, -643984, -643984]$[163, 432, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMPHsxEemfSIWqmJMEQA" id="(0.5157116451016636,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMPXsxEemfSIWqmJMEQA" id="(1.0,0.22099447513812154)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDNbXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNbnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNb3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNcHsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNcXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNcnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNc3sxEemfSIWqmJMEQA" x="-131" y="4"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDNdHsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_j_huQEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDNdXsxEemfSIWqmJMEQA" points="[-610, 445, -643984, -643984]$[-610, 43, -643984, -643984]$[-507, 43, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNdnsxEemfSIWqmJMEQA" id="(0.2515592515592516,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNd3sxEemfSIWqmJMEQA" id="(0.0,0.5390070921985816)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDNeHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNeXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNe3sxEemfSIWqmJMEQA" x="-11" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNfHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNfXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNfnsxEemfSIWqmJMEQA" x="2" y="3"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDNf3sxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_U8ovIEvUEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDNgHsxEemfSIWqmJMEQA" points="[859, -90, -643984, -643984]$[859, -10, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNgXsxEemfSIWqmJMEQA" id="(0.5278592375366569,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNgnsxEemfSIWqmJMEQA" id="(0.4701492537313433,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeDO03sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDOg3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO1HsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDO1XsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDO1nsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO13sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDO2HsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDO2XsxEemfSIWqmJMEQA" x="376" y="-47"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeDO2nsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_XJAVgEvTEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDO23sxEemfSIWqmJMEQA" points="[669, 580, -643984, -643984]$[-160, 580, -643984, -643984]$[-160, 669, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDO3HsxEemfSIWqmJMEQA" id="(0.0,0.08333333333333333)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDO3XsxEemfSIWqmJMEQA" id="(0.4226950354609929,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM7SnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7S3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7THsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7TXsxEemfSIWqmJMEQA" y="38"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7TnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7UHsxEemfSIWqmJMEQA" x="-3" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM7UXsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_2PzAoEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM7UnsxEemfSIWqmJMEQA" points="[-262, 480, -643984, -643984]$[-188, 480, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7U3sxEemfSIWqmJMEQA" id="(0.9937629937629938,0.44554455445544555)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7VHsxEemfSIWqmJMEQA" id="(0.0,0.5524861878453039)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM7VXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDO3nsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7VnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7V3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7WHsxEemfSIWqmJMEQA" x="-107" y="-5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7WXsxEemfSIWqmJMEQA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7WnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7W3sxEemfSIWqmJMEQA" x="-127" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7XHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7XXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7XnsxEemfSIWqmJMEQA" x="19" y="-46"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7X3sxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7YHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7YXsxEemfSIWqmJMEQA" x="-16" y="65"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7YnsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7Y3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7ZHsxEemfSIWqmJMEQA" x="13" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7ZXsxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7ZnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7Z3sxEemfSIWqmJMEQA" x="-18" y="-12"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM7aHsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM7bHsxEemfSIWqmJMEQA" points="[860, 147, -643984, -643984]$[860, 560, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7bXsxEemfSIWqmJMEQA" id="(0.4975124378109453,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7bnsxEemfSIWqmJMEQA" id="(0.5,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM7_nsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDInHsxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7_3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8AHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8AXsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8AnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8A3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8BHsxEemfSIWqmJMEQA" x="-83" y="5"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8BXsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_GURUYEvQEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8BnsxEemfSIWqmJMEQA" points="[260, 773, -643984, -643984]$[260, 920, -643984, -643984]$[161, 920, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8B3sxEemfSIWqmJMEQA" id="(0.6303854875283447,0.9807692307692307)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8CHsxEemfSIWqmJMEQA" id="(0.9906542056074766,0.6446280991735537)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM8JnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDK7HsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8J3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8KHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8KXsxEemfSIWqmJMEQA" x="-1" y="38"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8KnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8K3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8LHsxEemfSIWqmJMEQA" x="-5" y="13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8LXsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_KbhTEEvPEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8LnsxEemfSIWqmJMEQA" points="[289, 480, -643984, -643984]$[110, 480, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8L3sxEemfSIWqmJMEQA" id="(0.0,0.6)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8MHsxEemfSIWqmJMEQA" id="(1.0,0.5524861878453039)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM8MXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8MnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8M3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8NHsxEemfSIWqmJMEQA" x="94" y="5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8NXsxEemfSIWqmJMEQA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8NnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8N3sxEemfSIWqmJMEQA" x="114" y="-1"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8OHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeM8OXsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM8OnsxEemfSIWqmJMEQA" key="visible" value="true"/>
+    <element href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Ud59LHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59LXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59LnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59L3sxEemfSIWqmJMEQA" x="1" y="37"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59MHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59MXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59MnsxEemfSIWqmJMEQA" x="-4" y="-56"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Ud59M3sxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_4VIVcEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ud59NHsxEemfSIWqmJMEQA" points="[-278, 331, -643984, -643984]$[-278, 423, -643984, -643984]$[-178, 423, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59NXsxEemfSIWqmJMEQA" id="(0.5374280230326296,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59NnsxEemfSIWqmJMEQA" id="(0.0,0.18232044198895028)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_Ud59VHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDNg3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59VXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59VnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59V3sxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59WHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59WXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59WnsxEemfSIWqmJMEQA" x="-142" y="8"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Ud59W3sxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_DjvGcEvQEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ud59XHsxEemfSIWqmJMEQA" points="[670, 55, -643984, -643984]$[-123, 55, -643984, -643984]$[-123, 210, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59XXsxEemfSIWqmJMEQA" id="(0.0,0.33678756476683935)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59XnsxEemfSIWqmJMEQA" id="(0.8330134357005758,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_Ud5-jHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDK7HsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-jXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud5-jnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-j3sxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-kHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud5-kXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-knsxEemfSIWqmJMEQA" x="46" y="5"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Ud5-k3sxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_-4yPsEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ud5-lHsxEemfSIWqmJMEQA" points="[523, 262, -643984, -643984]$[602, 262, -643984, -643984]$[602, 430, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud5-lXsxEemfSIWqmJMEQA" id="(1.0,0.4132231404958678)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud5-lnsxEemfSIWqmJMEQA" id="(0.5416666666666666,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDIkXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDIknsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDIk3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIlHsxEemfSIWqmJMEQA" x="13" y="5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDIlXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDIlnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIl3sxEemfSIWqmJMEQA" x="8" y="-4"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDImHsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_nll2AEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDImXsxEemfSIWqmJMEQA" points="[-340, 200, -643984, -643984]$[-340, 96, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDImnsxEemfSIWqmJMEQA" id="(0.43761996161228406,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDIm3sxEemfSIWqmJMEQA" id="(0.5190615835777126,0.9858156028368794)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDLPHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDInHsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLPXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDLPnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLP3sxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLQHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDLQXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLQnsxEemfSIWqmJMEQA" x="152" y="-14"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDLQ3sxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_Zkij0EvTEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDLRHsxEemfSIWqmJMEQA" points="[670, 613, -643984, -643984]$[261, 613, -643984, -643984]$[261, 670, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDLRXsxEemfSIWqmJMEQA" id="(0.0,0.35833333333333334)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDLRnsxEemfSIWqmJMEQA" id="(0.6349206349206349,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDMC3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeM5bHsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMDHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMDXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMDnsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMD3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMEHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMEXsxEemfSIWqmJMEQA" x="59" y="11"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDMEnsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_Aez84EvQEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDME3sxEemfSIWqmJMEQA" points="[670, 118, -643984, -643984]$[262, 118, -643984, -643984]$[262, 210, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMFHsxEemfSIWqmJMEQA" id="(0.0,0.6632124352331606)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMFXsxEemfSIWqmJMEQA" id="(0.5175600739371534,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDMM3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMNHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMNXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMNnsxEemfSIWqmJMEQA" x="1" y="37"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMN3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMOHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMOXsxEemfSIWqmJMEQA" x="-73" y="5"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDMOnsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_HS8_oEvPEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDMO3sxEemfSIWqmJMEQA" points="[261, 331, -643984, -643984]$[261, 432, -643984, -643984]$[163, 432, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMPHsxEemfSIWqmJMEQA" id="(0.5157116451016636,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMPXsxEemfSIWqmJMEQA" id="(1.0,0.22099447513812154)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDNbXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNbnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNb3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNcHsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNcXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNcnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNc3sxEemfSIWqmJMEQA" x="-131" y="4"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDNdHsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_j_huQEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDNdXsxEemfSIWqmJMEQA" points="[-610, 445, -643984, -643984]$[-610, 43, -643984, -643984]$[-507, 43, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNdnsxEemfSIWqmJMEQA" id="(0.2515592515592516,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNd3sxEemfSIWqmJMEQA" id="(0.0,0.5390070921985816)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDNeHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNeXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNe3sxEemfSIWqmJMEQA" x="-11" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNfHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNfXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNfnsxEemfSIWqmJMEQA" x="2" y="3"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDNf3sxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_U8ovIEvUEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDNgHsxEemfSIWqmJMEQA" points="[859, -90, -643984, -643984]$[859, -10, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNgXsxEemfSIWqmJMEQA" id="(0.5278592375366569,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNgnsxEemfSIWqmJMEQA" id="(0.4701492537313433,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeDO03sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDOg3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO1HsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDO1XsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDO1nsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO13sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDO2HsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDO2XsxEemfSIWqmJMEQA" x="376" y="-47"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeDO2nsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_XJAVgEvTEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDO23sxEemfSIWqmJMEQA" points="[669, 580, -643984, -643984]$[-160, 580, -643984, -643984]$[-160, 669, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDO3HsxEemfSIWqmJMEQA" id="(0.0,0.08333333333333333)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDO3XsxEemfSIWqmJMEQA" id="(0.4226950354609929,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM7SnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7S3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7THsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7TXsxEemfSIWqmJMEQA" y="38"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7TnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7UHsxEemfSIWqmJMEQA" x="-3" y="-13"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM7UXsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_2PzAoEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM7UnsxEemfSIWqmJMEQA" points="[-262, 480, -643984, -643984]$[-188, 480, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7U3sxEemfSIWqmJMEQA" id="(0.9937629937629938,0.44554455445544555)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7VHsxEemfSIWqmJMEQA" id="(0.0,0.5524861878453039)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM7VXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDO3nsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7VnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7V3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7WHsxEemfSIWqmJMEQA" x="-107" y="-5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7WXsxEemfSIWqmJMEQA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7WnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7W3sxEemfSIWqmJMEQA" x="-127" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7XHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7XXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7XnsxEemfSIWqmJMEQA" x="19" y="-46"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7X3sxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7YHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7YXsxEemfSIWqmJMEQA" x="-16" y="65"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7YnsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7Y3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7ZHsxEemfSIWqmJMEQA" x="13" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7ZXsxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7ZnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7Z3sxEemfSIWqmJMEQA" x="-18" y="-12"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM7aHsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM7bHsxEemfSIWqmJMEQA" points="[860, 147, -643984, -643984]$[860, 560, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7bXsxEemfSIWqmJMEQA" id="(0.4975124378109453,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7bnsxEemfSIWqmJMEQA" id="(0.5,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM7_nsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDInHsxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7_3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8AHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8AXsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8AnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8A3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8BHsxEemfSIWqmJMEQA" x="-83" y="5"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8BXsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_GURUYEvQEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8BnsxEemfSIWqmJMEQA" points="[260, 773, -643984, -643984]$[260, 920, -643984, -643984]$[161, 920, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8B3sxEemfSIWqmJMEQA" id="(0.6303854875283447,0.9807692307692307)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8CHsxEemfSIWqmJMEQA" id="(0.9906542056074766,0.6446280991735537)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM8JnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDK7HsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8J3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8KHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8KXsxEemfSIWqmJMEQA" x="-1" y="38"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8KnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8K3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8LHsxEemfSIWqmJMEQA" x="-5" y="13"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8LXsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_KbhTEEvPEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8LnsxEemfSIWqmJMEQA" points="[289, 480, -643984, -643984]$[110, 480, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8L3sxEemfSIWqmJMEQA" id="(0.0,0.6)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8MHsxEemfSIWqmJMEQA" id="(1.0,0.5524861878453039)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM8MXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8MnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8M3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8NHsxEemfSIWqmJMEQA" x="94" y="5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8NXsxEemfSIWqmJMEQA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8NnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8N3sxEemfSIWqmJMEQA" x="114" y="-1"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8OHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:id="_UeM8OXsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+          <details xmi:id="_UeM8OnsxEemfSIWqmJMEQA" key="visible" value="true"/>
         </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8O3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8PHsxEemfSIWqmJMEQA" x="73" y="-17"/>
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8O3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8PHsxEemfSIWqmJMEQA" x="73" y="-17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8PXsxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8PnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8P3sxEemfSIWqmJMEQA" x="-53" y="15"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8PXsxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8PnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8P3sxEemfSIWqmJMEQA" x="-53" y="15"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8QHsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8QXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8QnsxEemfSIWqmJMEQA" x="15" y="14"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8QHsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8QXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8QnsxEemfSIWqmJMEQA" x="15" y="14"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8Q3sxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8RHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8RXsxEemfSIWqmJMEQA" x="-26" y="-16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8Q3sxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8RHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8RXsxEemfSIWqmJMEQA" x="-26" y="-16"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8RnsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8SnsxEemfSIWqmJMEQA" points="[1060, 520, -643984, -643984]$[1120, 520, -643984, -643984]$[1120, 60, -643984, -643984]$[1062, 60, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8S3sxEemfSIWqmJMEQA" id="(1.0,0.5)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8THsxEemfSIWqmJMEQA" id="(1.0,0.41450777202072536)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8RnsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8SnsxEemfSIWqmJMEQA" points="[1060, 520, -643984, -643984]$[1120, 520, -643984, -643984]$[1120, 60, -643984, -643984]$[1062, 60, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8S3sxEemfSIWqmJMEQA" id="(1.0,0.5)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8THsxEemfSIWqmJMEQA" id="(1.0,0.41450777202072536)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM8TXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDOg3sxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8TnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8UHsxEemfSIWqmJMEQA" y="40"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM8TXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDOg3sxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8TnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8UHsxEemfSIWqmJMEQA" y="40"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8UXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8UnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8U3sxEemfSIWqmJMEQA" x="-100" y="4"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8UXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8UnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8U3sxEemfSIWqmJMEQA" x="-100" y="4"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8VHsxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_Ja5uIEvQEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8VXsxEemfSIWqmJMEQA" points="[-280, 773, -643984, -643984]$[-280, 920, -643984, -643984]$[-159, 920, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8VnsxEemfSIWqmJMEQA" id="(0.2524822695035461,0.9807692307692307)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8V3sxEemfSIWqmJMEQA" id="(0.0,0.6446280991735537)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8VHsxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_Ja5uIEvQEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8VXsxEemfSIWqmJMEQA" points="[-280, 773, -643984, -643984]$[-280, 920, -643984, -643984]$[-159, 920, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8VnsxEemfSIWqmJMEQA" id="(0.2524822695035461,0.9807692307692307)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8V3sxEemfSIWqmJMEQA" id="(0.0,0.6446280991735537)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UeM8eHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM4lXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8eXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8ensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8e3sxEemfSIWqmJMEQA" y="40"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UeM8eHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM4lXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8eXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8ensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8e3sxEemfSIWqmJMEQA" y="40"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8fHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8fXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8fnsxEemfSIWqmJMEQA" x="-5" y="1"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8fHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8fXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8fnsxEemfSIWqmJMEQA" x="-5" y="1"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8f3sxEemfSIWqmJMEQA"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_7JO0wEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8gHsxEemfSIWqmJMEQA" points="[-444, 320, -643984, -643984]$[-444, 434, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8gXsxEemfSIWqmJMEQA" id="(0.2380038387715931,0.9917355371900827)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8gnsxEemfSIWqmJMEQA" id="(0.6174636174636174,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8f3sxEemfSIWqmJMEQA"/>
+      <element href="TapiEquipment.uml#_7JO0wEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8gHsxEemfSIWqmJMEQA" points="[-444, 320, -643984, -643984]$[-444, 434, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8gXsxEemfSIWqmJMEQA" id="(0.2380038387715931,0.9917355371900827)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8gnsxEemfSIWqmJMEQA" id="(0.6174636174636174,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TqTqUHh8EeqVN_GB3rPx7g" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_GLtMoHh7EeqVN_GB3rPx7g">
-      <children xmi:type="notation:DecorationNode" xmi:id="_TqTqU3h8EeqVN_GB3rPx7g" type="Usage_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TqTqVHh8EeqVN_GB3rPx7g" y="40"/>
+    <edges xsi:type="notation:Connector" xmi:id="_TqTqUHh8EeqVN_GB3rPx7g" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_GLtMoHh7EeqVN_GB3rPx7g">
+      <children xsi:type="notation:DecorationNode" xmi:id="_TqTqU3h8EeqVN_GB3rPx7g" type="Usage_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TqTqVHh8EeqVN_GB3rPx7g" y="40"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TqURYHh8EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TqURYXh8EeqVN_GB3rPx7g" x="-5" y="13"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TqURYHh8EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TqURYXh8EeqVN_GB3rPx7g" x="-5" y="13"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_TqTqUXh8EeqVN_GB3rPx7g"/>
-      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_TqIEIHh8EeqVN_GB3rPx7g"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqTqUnh8EeqVN_GB3rPx7g" points="[679, -180, -643984, -643984]$[541, -180, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UNblgHh8EeqVN_GB3rPx7g" id="(0.0,0.256198347107438)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UNblgXh8EeqVN_GB3rPx7g" id="(1.0,0.31007751937984496)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_TqTqUXh8EeqVN_GB3rPx7g"/>
+      <element href="TapiEquipment.uml#_TqIEIHh8EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TqTqUnh8EeqVN_GB3rPx7g" points="[679, -180, -643984, -643984]$[541, -180, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNblgHh8EeqVN_GB3rPx7g" id="(0.0,0.256198347107438)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNblgXh8EeqVN_GB3rPx7g" id="(1.0,0.31007751937984496)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XWSDhHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_Ud5-pXsxEemfSIWqmJMEQA" target="_XWSDgHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XWSDhXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XWSDiXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o3Dq1KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Ud5-pXsxEemfSIWqmJMEQA" target="_o3Dq0KaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o3Dq1aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3Dq2aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XWSDhnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWSDh3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWSDiHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o3Dq1qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3Dq16axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3Dq2KaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XWrsJHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDG_3sxEemfSIWqmJMEQA" target="_XWrsIHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XWrsJXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XWrsKXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o3r89KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDG_3sxEemfSIWqmJMEQA" target="_o3r88KaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o3r89aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3skAaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XWrsJnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWrsJ3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWrsKHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o3r89qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3r896axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3skAKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XXgylHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDInHsxEemfSIWqmJMEQA" target="_XXgykHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XXhZoHpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XXhZpHpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o4zXRKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDInHsxEemfSIWqmJMEQA" target="_o4zXQKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o4zXRaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o4zXSaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XXhZoXpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XXhZonpCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XXhZo3pCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o4zXRqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o4zXR6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o4zXSKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XYAh1HpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDI7HsxEemfSIWqmJMEQA" target="_XYAh0HpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XYAh1XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XYAh2XpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o5pExKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDI7HsxEemfSIWqmJMEQA" target="_o5pEwKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o5pExaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o5pEyaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XYAh1npCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XYAh13pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XYAh2HpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o5pExqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o5pEx6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o5pEyKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XY5SpHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeM7VXsxEemfSIWqmJMEQA" target="_XY5SoHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XY5SpXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XY5SqXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o7PnRKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM7VXsxEemfSIWqmJMEQA" target="_o7PnQKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o7PnRaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7PnSaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XY5SpnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XY5Sp3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XY5SqHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o7PnRqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7PnR6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7PnSKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XZBOdHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDK7HsxEemfSIWqmJMEQA" target="_XZBOcHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XZBOdXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XZB1gnpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o7Z_VKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDK7HsxEemfSIWqmJMEQA" target="_o7Z_UKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o7Z_VaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7amYKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XZBOdnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XZB1gHpCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XZB1gXpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o7Z_VqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7Z_V6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7Z_WKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XZPQ5HpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDLVXsxEemfSIWqmJMEQA" target="_XZPQ4HpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XZPQ5XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XZPQ6XpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o7vWhKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDLVXsxEemfSIWqmJMEQA" target="_o7vWgKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o7vWhaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7vWiaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XZPQ5npCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XZPQ53pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XZPQ6HpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o7vWhqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7vWh6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7vWiKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XZsj5HpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDNg3sxEemfSIWqmJMEQA" target="_XZsj4HpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XZsj5XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XZsj6XpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o8j15KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDNg3sxEemfSIWqmJMEQA" target="_o8j14KaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o8j15aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o8j16aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XZsj5npCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XZsj53pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XZsj6HpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o8j15qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o8j156axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o8j16KaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XaIBtHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDOX3sxEemfSIWqmJMEQA" target="_XaIBsHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XaIBtXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XaIBuXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o9KS0aaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDOX3sxEemfSIWqmJMEQA" target="_o9JrwKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o9KS0qaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9KS1qaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XaIBtnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XaIBt3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XaIBuHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o9KS06axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9KS1KaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9KS1aaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XaRytHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDOg3sxEemfSIWqmJMEQA" target="_XaRysHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XaRytXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XaRyuXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o9XHIaaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDOg3sxEemfSIWqmJMEQA" target="_o9WgEKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o9XHIqaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9XHJqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XaRytnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XaRyt3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XaRyuHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o9XHI6axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9XHJKaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9XHJaaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XayJAXpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeDO3nsxEemfSIWqmJMEQA" target="_Xaxh8HpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XayJAnpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XayJBnpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o-QfA6axEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDO3nsxEemfSIWqmJMEQA" target="_o-P38KaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o-QfBKaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o-QfCKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XayJA3pCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XayJBHpCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XayJBXpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o-QfBaaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o-QfBqaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o-QfB6axEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XbbpRHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeM8MXsxEemfSIWqmJMEQA" target="_XbbpQHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XbbpRXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XbbpSXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o_FldKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM8MXsxEemfSIWqmJMEQA" target="_o_FlcKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o_FldaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_FleaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XbbpRnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XbbpR3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XbbpSHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o_FldqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_Fld6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_FleKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XbmoZHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeM3eXsxEemfSIWqmJMEQA" target="_XbmoYHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XbmoZXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XbmoaXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_o_U2BKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM3eXsxEemfSIWqmJMEQA" target="_o_U2AKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_o_U2BaaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_U2CaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XbmoZnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XbmoZ3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XbmoaHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o_U2BqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_U2B6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_U2CKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XcIM1HpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeM4lXsxEemfSIWqmJMEQA" target="_XcIM0HpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_XcIM1XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XcIz4npCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_pAFD8aaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM4lXsxEemfSIWqmJMEQA" target="_pAEc4KaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_pAFD8qaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAFD9qaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XcIM1npCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XcIz4HpCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XcIz4XpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_pAFD86axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAFD9KaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAFD9aaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xcbu1HpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_UeM5bHsxEemfSIWqmJMEQA" target="_Xcbu0HpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xcbu1XpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XccV4npCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_pAhv5KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM5bHsxEemfSIWqmJMEQA" target="_pAhv4KaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_pAhv5aaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAhv6aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xcbu1npCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XccV4HpCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XccV4XpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_pAhv5qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAhv56axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAhv6KaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Xc1XdHpCEeq5cO49XpLuJQ" type="StereotypeCommentLink" source="_GLtMoHh7EeqVN_GB3rPx7g" target="_Xc1XcHpCEeq5cO49XpLuJQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Xc1XdXpCEeq5cO49XpLuJQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xc1XeXpCEeq5cO49XpLuJQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_pBKpEaaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GLtMoHh7EeqVN_GB3rPx7g" target="_pBKCAKaxEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_pBKpEqaxEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pBKpFqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xc1XdnpCEeq5cO49XpLuJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xc1Xd3pCEeq5cO49XpLuJQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xc1XeHpCEeq5cO49XpLuJQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_pBKpE6axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pBKpFKaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pBKpFaaxEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/UML/TapiEquipment.uml b/UML/TapiEquipment.uml
index 4d7c203e..33f17e30 100644
--- a/UML/TapiEquipment.uml
+++ b/UML/TapiEquipment.uml
@@ -117,9 +117,6 @@
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_Tt0usE2tEemQQPVBE79CWA" client="_8PYHQE2sEemQQPVBE79CWA">
         <supplier xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_K2ClIFojEemu443YKSGnxQ" client="_BQiK0FogEemu443YKSGnxQ">
-        <supplier xmi:type="uml:Enumeration" href="TapiCommon.uml#_FFtS8CzeEeaYO8M_h7XJ5A"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Usage" xmi:id="_TqIEIHh8EeqVN_GB3rPx7g" client="_BB_mUDmkEemDl_QGWIY6yg" supplier="_350koG20Eeqjr-4srHPKHw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_mlzoUEdzEeasL6dcjI1vEA" name="TypeDefinitions">
@@ -991,7 +988,6 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
   <OpenModel_Profile:StrictComposite xmi:id="_-UAXUFFjEemgMYGocegK5A" base_Association="_S0vuMEvXEemT5f_Ewhfs6A"/>
   <OpenModel_Profile:StrictComposite xmi:id="_Auv7cFFkEemgMYGocegK5A" base_Association="_V181YEvXEemT5f_Ewhfs6A"/>
   <OpenModel_Profile:Experimental xmi:id="_EeSgQFogEemu443YKSGnxQ" base_Element="_BQiK0FogEemu443YKSGnxQ"/>
-  <OpenModel_Profile:Specify xmi:id="_MruUYFojEemu443YKSGnxQ" base_Abstraction="_K2ClIFojEemu443YKSGnxQ"/>
   <OpenModel_Profile:OpenModelInterface xmi:id="_EMuGQHspEemfSIWqmJMEQA" base_Interface="_EMk8UHspEemfSIWqmJMEQA"/>
   <OpenModel_Profile:OpenModelOperation xmi:id="_FCC50XsrEemfSIWqmJMEQA" base_Operation="_FCC50HsrEemfSIWqmJMEQA"/>
   <OpenModel_Profile:OpenModelParameter xmi:id="_SrGJcXsrEemfSIWqmJMEQA" base_Parameter="_SrGJcHsrEemfSIWqmJMEQA"/>
@@ -1016,4 +1012,5 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kGNzEW27Eeqjr-4srHPKHw" base_StructuralFeature="_kGNzEG27Eeqjr-4srHPKHw"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_kGOaIG27Eeqjr-4srHPKHw" base_Property="_kGNzEG27Eeqjr-4srHPKHw"/>
   <OpenModel_Profile:Experimental xmi:id="__Hu4oG27Eeqjr-4srHPKHw" base_Element="_kGNzEG27Eeqjr-4srHPKHw"/>
+  <OpenModel_Profile:Deprecated xmi:id="_46IQYKayEeqJcvXkREZ1XQ" base_Element="_BQiK0FogEemu443YKSGnxQ"/>
 </xmi:XMI>
diff --git a/UML/TapiNotification.notation b/UML/TapiNotification.notation
index 7c01b553..29aa440d 100644
--- a/UML/TapiNotification.notation
+++ b/UML/TapiNotification.notation
@@ -1,1617 +1,1643 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmi:id="_tIFpEDBHEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="NotificationServiceDetails" measurementUnit="Pixel">
-  <children xsi:type="notation:Shape" xmi:id="_whCh4DBHEeam35bpdXJzEw" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCh4TBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCh4jBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh4zBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCh5DBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_whCh5TBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_hZotiCzcEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh5jBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCh5zBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_qgPssCzcEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh6DBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCh6TBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_sa1KECzcEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh6jBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_ptyUwOSWEeaMvo3u46vn9g" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_Hf-y4NwrEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ptyUweSWEeaMvo3u46vn9g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_pt-iAOSWEeaMvo3u46vn9g" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_JjUjoNwrEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_pt-iAeSWEeaMvo3u46vn9g"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCh7TBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCh7jBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCh7zBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCh8DBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_hZotgCzcEeaYO8M_h7XJ5A"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCiAzBHEeam35bpdXJzEw" x="635" y="585"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whCiBDBHEeam35bpdXJzEw" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCiBTBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCiBjBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiBzBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCiCDBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_whCiCTBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_ggplICzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiCjBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCiCzBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_h_dFcCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiDDBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCiDTBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_jrUKUCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiDjBHEeam35bpdXJzEw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCiDzBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCiEDBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCiETBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCiEjBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_bgwjsCzeEeaYO8M_h7XJ5A"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCiJTBHEeam35bpdXJzEw" x="868" y="595" height="91"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whCiJjBHEeam35bpdXJzEw" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCiJzBHEeam35bpdXJzEw" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCiKDBHEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiKTBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCiKjBHEeam35bpdXJzEw" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_whCiKzBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-        <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiSjBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCiSzBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-        <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiajBHEeam35bpdXJzEw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCiizBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCijDBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCijTBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCijjBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCijzBHEeam35bpdXJzEw" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCikDBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCikTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCikjBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCikzBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCilDBHEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCilTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCiljBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCilzBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCimDBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiCommon.uml#_xEvjkN8AEeW-BtRsuJPbqg"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCixjBHEeam35bpdXJzEw" x="471" y="244" height="84"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whCixzBHEeam35bpdXJzEw" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCiyDBHEeam35bpdXJzEw" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whCiyTBHEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiyjBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCiyzBHEeam35bpdXJzEw" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_whCizDBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_8YhJQCzxEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCi6zBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCi7DBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#__0cdkCzxEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCjCzBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCjDDBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_FwOfgCzyEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCjKzBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whCjLDBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_KPrGUCzyEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCjSzBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_0oxwAE8XEea3rq3M7G3w3w" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_q0nuUE8XEea3rq3M7G3w3w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0oxwAU8XEea3rq3M7G3w3w"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_a8g7MBMtEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-        <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_a8g7MRMtEee0L_IMWjydgQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_a8g7MhMtEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-        <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_a8g7MxMtEee0L_IMWjydgQ"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCjTDBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCjTTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCjTjBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjTzBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCjUDBHEeam35bpdXJzEw" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCjUTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCjUjBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCjUzBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjVDBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whCjVTBHEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whCjVjBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whCjVzBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whCjWDBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjWTBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_phsNMCzxEeaYO8M_h7XJ5A"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjhzBHEeam35bpdXJzEw" x="22" y="522" height="156"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whMS9zBHEeam35bpdXJzEw" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMS-DBHEeam35bpdXJzEw" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMS-TBHEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whMS-jBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMS-zBHEeam35bpdXJzEw" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_Z1XQ9MPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_5oI2dC1sEeair-8ZDvf8jw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ9cPQEeaiK6pYrNo12g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Z1XQ9sPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_Nsg9dE8cEea3rq3M7G3w3w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ98PQEeaiK6pYrNo12g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Z1XQ-MPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_rZ7rxCzyEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ-cPQEeaiK6pYrNo12g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Z1XQ-sPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_BeqnEC0bEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ-8PQEeaiK6pYrNo12g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Z1XQ_MPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_0iGcECzwEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ_cPQEeaiK6pYrNo12g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Z1XQ_sPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_4HEXoCzwEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ_8PQEeaiK6pYrNo12g"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_gM0K8NwpEeaaobmDldrjOQ" type="Property_ClassAttributeLabel">
-        <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_gM0K8dwpEeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_gM0K8twpEeaaobmDldrjOQ" type="Property_ClassAttributeLabel">
-        <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_gM0K89wpEeaaobmDldrjOQ"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMTnDBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMTnTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMTnjBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMTnzBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMToDBHEeam35bpdXJzEw" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMToTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMTojBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMTozBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMTpDBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMTpTBHEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMTpjBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMTpzBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMTqDBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMTqTBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_oVDs4CzvEeaYO8M_h7XJ5A"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMT1zBHEeam35bpdXJzEw" x="61" y="232" height="174"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whMT4jBHEeam35bpdXJzEw" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMT4zBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMT5DBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whMT5TBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMT5jBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_whMT5zBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_0ThbcC0aEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMT6DBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMT6TBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_1QrAMC0aEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMT6jBHEeam35bpdXJzEw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMT6zBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMT7DBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMT7TBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMT7jBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_Rjd84C0aEeah7qIgVNfKeA"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMUATBHEeam35bpdXJzEw" x="650" y="739" height="82"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whMUAjBHEeam35bpdXJzEw" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMUAzBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMUBDBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whMUBTBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMUBjBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_e2YzwBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_Jsw9oCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2YzwRNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2Za0BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_KpUFcCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2Za0RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2aB4BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_LaJFcCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB4RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2aB4hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_MakAoCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB4xNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2aB5BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_NRwuYCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB5RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2aB5hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_OxHoUCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB5xNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2aB6BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_RB-QoCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB6RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ao8BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_SlD0ACzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao8RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ao8hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_UVnLoCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao8xNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ao9BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_Vq3uYCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao9RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ao9hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_XRFeQCzeEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao9xNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ao-BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#__WB2QBNXEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao-RNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2bQABNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_CILNwBNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQARNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2bQAhNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_EpIHkBNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQAxNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2bQBBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_GI_-4BNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQBRNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2bQBhNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_vV3I0BNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQBxNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2bQCBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_wPccMBNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2b3EBNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2b3ERNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_xSSZQBNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2b3EhNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ceIBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_MKoKIBNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ceIRNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ceIhNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_Na--wBNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ceIxNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_e2ceJBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_tPnOABNYEeiKtYjI8wVF7A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ceJRNaEeiKtYjI8wVF7A"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_wRLNUINiEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_vfVu8JAdEei1rofSed2vtg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_wRLNUYNiEeqLl4tIPv2RCg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_N3GJUINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_DnT7kINjEeqLl4tIPv2RCg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_N3GJUYNjEeqLl4tIPv2RCg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_N3GwYINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_FbKe0INjEeqLl4tIPv2RCg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_N3GwYYNjEeqLl4tIPv2RCg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_N3HXcINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_HWLaAINjEeqLl4tIPv2RCg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_N3HXcYNjEeqLl4tIPv2RCg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_N3HXcoNjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_I66jMINjEeqLl4tIPv2RCg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_N3HXc4NjEeqLl4tIPv2RCg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_N3H-gINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_K44EsINjEeqLl4tIPv2RCg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_N3H-gYNjEeqLl4tIPv2RCg"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMUHTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMUHjBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMUHzBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMUIDBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_FFtS8CzeEeaYO8M_h7XJ5A"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMUMzBHEeam35bpdXJzEw" x="1520" y="200"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whMUSDBHEeam35bpdXJzEw" type="Signal_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMUSTBHEeam35bpdXJzEw" type="Signal_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMUSjBHEeam35bpdXJzEw" type="Signal_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whMUSzBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMUTDBHEeam35bpdXJzEw" type="Signal_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_LzON4CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#__HbVoCzoEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON4SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON4iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_RH-xACzpEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON4yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON5CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_TLUZYE8lEea3rq3M7G3w3w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON5SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON5iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_fbcaICzqEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON5yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON6CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_p0dcYCzqEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON6SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON6iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_9CxHgE8cEea3rq3M7G3w3w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON6yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON7CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_virjcCzqEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON7SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzON7iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_gu8iACztEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON7yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX0CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_u53agCzrEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX0SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX0iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_3CrUsCzrEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX0yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX1CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_x4d5oCzrEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX1SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX1iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_Hh5YEyB_EeeWCKlkirNtnw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX1yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX2CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiNotification.uml#_HA6K4yB_EeeWCKlkirNtnw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX2SCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX2iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX2yCAEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_LzXX3CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
-        <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX3SCAEeeWCKlkirNtnw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMVrTBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMVrjBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMVrzBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMVsDBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_7CEIsC1qEeair-8ZDvf8jw"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMV2jBHEeam35bpdXJzEw" x="322" y="468" height="300"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_whMV2zBHEeam35bpdXJzEw" type="Interface_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMV3DBHEeam35bpdXJzEw" type="Interface_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_whMV3TBHEeam35bpdXJzEw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_whMV3jBHEeam35bpdXJzEw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMV3zBHEeam35bpdXJzEw" type="Interface_AttributeCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMV4DBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMV4TBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMV4jBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMV4zBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMV5DBHEeam35bpdXJzEw" type="Interface_OperationCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_whMV5TBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMV5jBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_1JlTAC0VEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMV_zBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMWADBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWATBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_2Iz7YC0VEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWGjBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMWGzBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWHDBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_Sgs2oC0ZEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWNTBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMWNjBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWNzBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_o5NJsC0ZEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWUDBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMWUTBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWUjBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_BDuFkC0dEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWazBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMWbDBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWbTBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_MQ03MC0dEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWhjBHEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_whMWhzBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
-        <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWiDBHEeam35bpdXJzEw" name="maskLabel">
-          <stringListValue>parametersName</stringListValue>
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>parametersMultiplicity</stringListValue>
-          <stringListValue>defaultValue</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>parametersType</stringListValue>
-        </styles>
-        <element href="TapiNotification.uml#_SumL4C0dEeah7qIgVNfKeA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWoTBHEeam35bpdXJzEw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMWojBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMWozBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMWpDBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMWpTBHEeam35bpdXJzEw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_whMWpjBHEeam35bpdXJzEw" visible="false" type="Interface_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_whMWpzBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_whMWqDBHEeam35bpdXJzEw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_whMWqTBHEeam35bpdXJzEw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMWqjBHEeam35bpdXJzEw"/>
-    </children>
-    <element href="TapiNotification.uml#_2HbQwC0UEeah7qIgVNfKeA"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMW0DBHEeam35bpdXJzEw" x="-4" y="-115" height="175"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_wiFD0DBHEeam35bpdXJzEw" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_wiFD0TBHEeam35bpdXJzEw" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wiFD0zBHEeam35bpdXJzEw" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_5oI2cC1sEeair-8ZDvf8jw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wiFD0jBHEeam35bpdXJzEw" x="395" y="135"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_kaYoEE8SEea3rq3M7G3w3w" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_kaYoEU8SEea3rq3M7G3w3w" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kaYoE08SEea3rq3M7G3w3w" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_kFsxgE8SEea3rq3M7G3w3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kaYoEk8SEea3rq3M7G3w3w" x="609" y="372"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_q_PtIE8bEea3rq3M7G3w3w" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_q_PtIk8bEea3rq3M7G3w3w" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_q_PtI08bEea3rq3M7G3w3w" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_q_PtJE8bEea3rq3M7G3w3w" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_q_PtJU8bEea3rq3M7G3w3w" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_MvhJsE8cEea3rq3M7G3w3w" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_xvMMYE8aEea3rq3M7G3w3w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MvhJsU8cEea3rq3M7G3w3w"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_MvhJsk8cEea3rq3M7G3w3w" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_LYuLUE8bEea3rq3M7G3w3w"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MvhJs08cEea3rq3M7G3w3w"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_q_PtJk8bEea3rq3M7G3w3w"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_q_PtJ08bEea3rq3M7G3w3w"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_q_PtKE8bEea3rq3M7G3w3w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtKU8bEea3rq3M7G3w3w"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_q_PtKk8bEea3rq3M7G3w3w" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_q_PtK08bEea3rq3M7G3w3w"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_q_PtLE8bEea3rq3M7G3w3w"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_q_PtLU8bEea3rq3M7G3w3w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtLk8bEea3rq3M7G3w3w"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_q_PtL08bEea3rq3M7G3w3w" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_q_PtME8bEea3rq3M7G3w3w"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_q_PtMU8bEea3rq3M7G3w3w"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_q_PtMk8bEea3rq3M7G3w3w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtM08bEea3rq3M7G3w3w"/>
-    </children>
-    <element href="TapiNotification.uml#_aQ9x8E8bEea3rq3M7G3w3w"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtIU8bEea3rq3M7G3w3w" x="58" y="707" width="196" height="76"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_mX0b0Mh5EeaVlemTikmRHw" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_mX0b0sh5EeaVlemTikmRHw" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_mX0b08h5EeaVlemTikmRHw" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_mX0b1Mh5EeaVlemTikmRHw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_mX0b1ch5EeaVlemTikmRHw" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_Pk8rgsh6EeaVlemTikmRHw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_weSVhMh5EeaVlemTikmRHw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Pk8rg8h6EeaVlemTikmRHw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Pk8rhMh6EeaVlemTikmRHw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_AGv4JMh6EeaVlemTikmRHw"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Pk8rhch6EeaVlemTikmRHw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_mX0b1sh5EeaVlemTikmRHw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_mX0b18h5EeaVlemTikmRHw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_mX0b2Mh5EeaVlemTikmRHw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b2ch5EeaVlemTikmRHw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_mX0b2sh5EeaVlemTikmRHw" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_mX0b28h5EeaVlemTikmRHw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_mX0b3Mh5EeaVlemTikmRHw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_mX0b3ch5EeaVlemTikmRHw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b3sh5EeaVlemTikmRHw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_mX0b38h5EeaVlemTikmRHw" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_mX0b4Mh5EeaVlemTikmRHw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_mX0b4ch5EeaVlemTikmRHw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_mX0b4sh5EeaVlemTikmRHw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b48h5EeaVlemTikmRHw"/>
-    </children>
-    <element href="TapiNotification.uml#_mWGkkMh5EeaVlemTikmRHw"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b0ch5EeaVlemTikmRHw" x="187" y="75" height="74"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_a_-dMNwqEeaaobmDldrjOQ" type="DataType_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_a_-dMtwqEeaaobmDldrjOQ" type="DataType_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_a_-dM9wqEeaaobmDldrjOQ" type="DataType_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_a_-dNNwqEeaaobmDldrjOQ" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_a_-dNdwqEeaaobmDldrjOQ" type="DataType_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_c6ozENwqEeaaobmDldrjOQ" type="Property_DataTypeAttributeLabel">
-        <element href="TapiNotification.uml#__Pe64iznEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_c6ozEdwqEeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_c6ozEtwqEeaaobmDldrjOQ" type="Property_DataTypeAttributeLabel">
-        <element href="TapiNotification.uml#__Pe65iznEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_c6ozE9wqEeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_c6ozFNwqEeaaobmDldrjOQ" type="Property_DataTypeAttributeLabel">
-        <element href="TapiNotification.uml#_E_LBkCzoEeaYO8M_h7XJ5A"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_c6ozFdwqEeaaobmDldrjOQ"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_a_-dNtwqEeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_a_-dN9wqEeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_a_-dONwqEeaaobmDldrjOQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a_-dOdwqEeaaobmDldrjOQ"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_a_-dOtwqEeaaobmDldrjOQ" type="DataType_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_a_-dO9wqEeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_a_-dPNwqEeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_a_-dPdwqEeaaobmDldrjOQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a_-dPtwqEeaaobmDldrjOQ"/>
-    </children>
-    <element href="TapiNotification.uml#__Pe64CznEeaYO8M_h7XJ5A"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a_-dMdwqEeaaobmDldrjOQ" x="799" y="727" height="99"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_4AKukNwtEeaaobmDldrjOQ" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_4AKukdwtEeaaobmDldrjOQ" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4ANK0NwtEeaaobmDldrjOQ" name="BASE_ELEMENT"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4AKuktwtEeaaobmDldrjOQ" x="200"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_7YJXA9wtEeaaobmDldrjOQ" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_7YJXBNwtEeaaobmDldrjOQ" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7YJXBtwtEeaaobmDldrjOQ" name="BASE_ELEMENT"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7YJXBdwtEeaaobmDldrjOQ" x="858" y="627"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_5B2mUNwzEeaaobmDldrjOQ" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_5B3NYNwzEeaaobmDldrjOQ" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5B3NYdwzEeaaobmDldrjOQ" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5B3NYtwzEeaaobmDldrjOQ" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_5B30cNwzEeaaobmDldrjOQ" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_Fc0SMNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_-WiMANwzEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc0SMdw0EeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Fc05QNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_9MhP8NwzEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc05Qdw0EeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Fc05Qtw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#__wAgYNwzEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc05Q9w0EeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Fc05RNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_At-kgNw0EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc05Rdw0EeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_Fc1gUNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_C8cnMNw0EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc1gUdw0EeaaobmDldrjOQ"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_5B30cdwzEeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_5B30ctwzEeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_5B30c9wzEeaaobmDldrjOQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5B30dNwzEeaaobmDldrjOQ"/>
-    </children>
-    <element href="TapiNotification.uml#_5ByU4NwzEeaaobmDldrjOQ"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5B2mUdwzEeaaobmDldrjOQ" x="993" y="696"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_GocX0Nw0EeaaobmDldrjOQ" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_Goc-4Nw0EeaaobmDldrjOQ" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_Goc-4dw0EeaaobmDldrjOQ" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_Goc-4tw0EeaaobmDldrjOQ" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_Goc-49w0EeaaobmDldrjOQ" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_g9mGoNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_NckXANw0EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_g9mGodw0EeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_g9mtsNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_Oy87INw0EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_g9mtsdw0EeaaobmDldrjOQ"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_g9mtstw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_V171sNw0EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_g9mts9w0EeaaobmDldrjOQ"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Goc-5Nw0EeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_Goc-5dw0EeaaobmDldrjOQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_Goc-5tw0EeaaobmDldrjOQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Goc-59w0EeaaobmDldrjOQ"/>
-    </children>
-    <element href="TapiNotification.uml#_GoZUgNw0EeaaobmDldrjOQ"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GocX0dw0EeaaobmDldrjOQ" x="803" y="847"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_291_09w2EeaaobmDldrjOQ" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_291_1Nw2EeaaobmDldrjOQ" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_291_1tw2EeaaobmDldrjOQ" name="BASE_ELEMENT"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_291_1dw2EeaaobmDldrjOQ" x="697" y="721"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_5ZhnIOcCEeaDNtnUN91VDg" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_5ZkqcOcCEeaDNtnUN91VDg" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5ZkqcecCEeaDNtnUN91VDg" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5ZkqcucCEeaDNtnUN91VDg" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_5Zkqc-cCEeaDNtnUN91VDg" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_IOqPYOcDEeaDNtnUN91VDg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_D2NBYOcDEeaDNtnUN91VDg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IOqPYecDEeaDNtnUN91VDg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_IOq2cOcDEeaDNtnUN91VDg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_FvNKYOcDEeaDNtnUN91VDg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IOq2cecDEeaDNtnUN91VDg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_IOrdgOcDEeaDNtnUN91VDg" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_HCD5YOcDEeaDNtnUN91VDg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IOrdgecDEeaDNtnUN91VDg"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_5ZkqdOcCEeaDNtnUN91VDg"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_5ZkqdecCEeaDNtnUN91VDg"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_5ZkqducCEeaDNtnUN91VDg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5Zkqd-cCEeaDNtnUN91VDg"/>
-    </children>
-    <element href="TapiNotification.uml#_5QUAwOcCEeaDNtnUN91VDg"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5ZhnIecCEeaDNtnUN91VDg" x="990" y="849"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_oASyi_LfEeaAIfPpmDwI5Q" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_oASyjPLfEeaAIfPpmDwI5Q" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oASyjvLfEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oASyjfLfEeaAIfPpmDwI5Q" x="200"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_oDXmQBM5Eee0L_IMWjydgQ" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_oDXmQhM5Eee0L_IMWjydgQ" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_oDXmQxM5Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_oDXmRBM5Eee0L_IMWjydgQ" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_oDXmRRM5Eee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oDXmRhM5Eee0L_IMWjydgQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_oDXmRxM5Eee0L_IMWjydgQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_oDXmSBM5Eee0L_IMWjydgQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmSRM5Eee0L_IMWjydgQ"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_oDXmShM5Eee0L_IMWjydgQ" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oDXmSxM5Eee0L_IMWjydgQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_oDXmTBM5Eee0L_IMWjydgQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_oDXmTRM5Eee0L_IMWjydgQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmThM5Eee0L_IMWjydgQ"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_oDXmTxM5Eee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oDXmUBM5Eee0L_IMWjydgQ"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_oDXmURM5Eee0L_IMWjydgQ"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_oDXmUhM5Eee0L_IMWjydgQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmUxM5Eee0L_IMWjydgQ"/>
-    </children>
-    <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmQRM5Eee0L_IMWjydgQ" x="711" y="83"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_K1csICCCEeeWCKlkirNtnw" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_K1csIiCCEeeWCKlkirNtnw" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_K1csIyCCEeeWCKlkirNtnw" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_K1csJCCCEeeWCKlkirNtnw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_K1csJSCCEeeWCKlkirNtnw" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_agQYICCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_xC-10Nw0EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYISCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_agQYIiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_FcWm4NwuEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYIyCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_agQYJCCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_DIyo0NwuEeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYJSCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_agQYJiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_f0a_wOcDEeaDNtnUN91VDg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYJyCCEeeWCKlkirNtnw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_K1csJiCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_K1csJyCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_K1csKCCCEeeWCKlkirNtnw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csKSCCEeeWCKlkirNtnw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_K1csKiCCEeeWCKlkirNtnw" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_K1csKyCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_K1csLCCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_K1csLSCCEeeWCKlkirNtnw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csLiCCEeeWCKlkirNtnw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_K1csLyCCEeeWCKlkirNtnw" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_K1csMCCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_K1csMSCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_K1csMiCCEeeWCKlkirNtnw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csMyCCEeeWCKlkirNtnw"/>
-    </children>
-    <element href="TapiNotification.uml#_K1S7ICCCEeeWCKlkirNtnw"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csISCCEeeWCKlkirNtnw" x="188" y="848" height="111"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_MQpe0SCCEeeWCKlkirNtnw" type="Class_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_MQpe0yCCEeeWCKlkirNtnw" type="Class_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_MQpe1CCCEeeWCKlkirNtnw" type="Class_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_MQpe1SCCEeeWCKlkirNtnw" y="5"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_MQpe1iCCEeeWCKlkirNtnw" type="Class_AttributeCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_cdruICCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_1iNvUNw2EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruISCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_cdruIiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_x-5ZkNw2EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruIyCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_cdruJCCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#__1HX8Nw1EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruJSCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_cdruJiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_nJFtoNw2EeaaobmDldrjOQ"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruJyCCEeeWCKlkirNtnw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_JpYPYJAdEei1rofSed2vtg" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_JfqSsJAdEei1rofSed2vtg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_JpYPYZAdEei1rofSed2vtg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_ckw7UJAdEei1rofSed2vtg" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_cdDw0JAdEei1rofSed2vtg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ckw7UZAdEei1rofSed2vtg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_9dH4cJAdEei1rofSed2vtg" type="Property_ClassAttributeLabel">
-        <element href="TapiNotification.uml#_9VXDkJAdEei1rofSed2vtg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9dH4cZAdEei1rofSed2vtg"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_MQpe1yCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_MQpe2CCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_MQpe2SCCEeeWCKlkirNtnw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe2iCCEeeWCKlkirNtnw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_MQpe2yCCEeeWCKlkirNtnw" type="Class_OperationCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_MQpe3CCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_MQpe3SCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_MQpe3iCCEeeWCKlkirNtnw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe3yCCEeeWCKlkirNtnw"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_MQpe4CCCEeeWCKlkirNtnw" type="Class_NestedClassifierCompartment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_MQpe4SCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_MQpe4iCCEeeWCKlkirNtnw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_MQpe4yCCEeeWCKlkirNtnw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe5CCCEeeWCKlkirNtnw"/>
-    </children>
-    <element href="TapiNotification.uml#_MQft0CCCEeeWCKlkirNtnw"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe0iCCEeeWCKlkirNtnw" x="479" y="847" height="134"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="__1VZoFDREeeINtPz0JX6oA" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="__1VZoVDREeeINtPz0JX6oA"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="__1VZo1DREeeINtPz0JX6oA" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="__1VZolDREeeINtPz0JX6oA" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_ChzhwFqoEeexvMtO2oNM9g" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_ChzhwVqoEeexvMtO2oNM9g" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Chzhw1qoEeexvMtO2oNM9g" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ChzhwlqoEeexvMtO2oNM9g" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_DO0_0FqoEeexvMtO2oNM9g" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_DO0_0VqoEeexvMtO2oNM9g" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DO0_01qoEeexvMtO2oNM9g" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DO0_0lqoEeexvMtO2oNM9g" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_DPr7cFqoEeexvMtO2oNM9g" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_DPr7cVqoEeexvMtO2oNM9g" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DPr7c1qoEeexvMtO2oNM9g" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DPr7clqoEeexvMtO2oNM9g" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_bx5HUFrnEeexvMtO2oNM9g" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_bx5HUVrnEeexvMtO2oNM9g" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bx5HU1rnEeexvMtO2oNM9g" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bx5HUlrnEeexvMtO2oNM9g" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_kq-EoMrkEeeFHsPqdArtwA" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_kq-EocrkEeeFHsPqdArtwA" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kq-Eo8rkEeeFHsPqdArtwA" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kq-EosrkEeeFHsPqdArtwA" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_MKUj48rlEeeFHsPqdArtwA" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_MKUj5MrlEeeFHsPqdArtwA" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_MKUj5srlEeeFHsPqdArtwA" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MKUj5crlEeeFHsPqdArtwA" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_xKIQMO_UEee2fqmozVFruQ" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_xKIQMe_UEee2fqmozVFruQ" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_xKIQM-_UEee2fqmozVFruQ" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xKIQMu_UEee2fqmozVFruQ" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_aA6sEBEJEeix4OZk6OGmSg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_aA6sEREJEeix4OZk6OGmSg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aA6sExEJEeix4OZk6OGmSg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aA6sEhEJEeix4OZk6OGmSg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_nPpcQBJ_Eeix4OZk6OGmSg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_nPpcQRJ_Eeix4OZk6OGmSg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nPpcQxJ_Eeix4OZk6OGmSg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nPpcQhJ_Eeix4OZk6OGmSg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_ecplcBNXEeiKtYjI8wVF7A" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_ecplcRNXEeiKtYjI8wVF7A" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ecqMgBNXEeiKtYjI8wVF7A" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ecplchNXEeiKtYjI8wVF7A" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_Xo0Z0BNaEeiKtYjI8wVF7A" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_Xo0Z0RNaEeiKtYjI8wVF7A" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xo0Z0xNaEeiKtYjI8wVF7A" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xo0Z0hNaEeiKtYjI8wVF7A" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_nyMeWmRFEeikqoAaJ65uUg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_nyMeW2RFEeikqoAaJ65uUg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nyMeXWRFEeikqoAaJ65uUg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nyMeXGRFEeikqoAaJ65uUg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_oZmclGRFEeikqoAaJ65uUg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_oZmclWRFEeikqoAaJ65uUg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oZmcl2RFEeikqoAaJ65uUg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oZmclmRFEeikqoAaJ65uUg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_oaE9sGRFEeikqoAaJ65uUg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_oaE9sWRFEeikqoAaJ65uUg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oaE9s2RFEeikqoAaJ65uUg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oaE9smRFEeikqoAaJ65uUg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_6LW2imm1EeiLh_06MH5Rjg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_6LW2i2m1EeiLh_06MH5Rjg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6LW2jWm1EeiLh_06MH5Rjg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6LW2jGm1EeiLh_06MH5Rjg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_6p4leGm1EeiLh_06MH5Rjg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_6p4leWm1EeiLh_06MH5Rjg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6p4le2m1EeiLh_06MH5Rjg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6p4lemm1EeiLh_06MH5Rjg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_6qXGpGm1EeiLh_06MH5Rjg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_6qXGpWm1EeiLh_06MH5Rjg" showTitle="true"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6qXGp2m1EeiLh_06MH5Rjg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6qXGpmm1EeiLh_06MH5Rjg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_dlxZ0IuSEeiu6boZkiJHCA" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_dlxZ0YuSEeiu6boZkiJHCA"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dlxZ04uSEeiu6boZkiJHCA" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dlxZ0ouSEeiu6boZkiJHCA" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_jtieAJwUEeidac_mNnugIw" type="Enumeration_Shape">
-    <children xsi:type="notation:DecorationNode" xmi:id="_jtjFEJwUEeidac_mNnugIw" type="Enumeration_NameLabel"/>
-    <children xsi:type="notation:DecorationNode" xmi:id="_jtjFEZwUEeidac_mNnugIw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_jtjFEpwUEeidac_mNnugIw" y="15"/>
-    </children>
-    <children xsi:type="notation:BasicCompartment" xmi:id="_jtjFE5wUEeidac_mNnugIw" type="Enumeration_LiteralCompartment">
-      <children xsi:type="notation:Shape" xmi:id="_lbFk8JwUEeidac_mNnugIw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_YE76AZAdEei1rofSed2vtg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lbFk8ZwUEeidac_mNnugIw"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_lbGMAJwUEeidac_mNnugIw" type="EnumerationLiteral_LiteralLabel">
-        <element href="TapiNotification.uml#_YE76ApAdEei1rofSed2vtg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lbGMAZwUEeidac_mNnugIw"/>
-      </children>
-      <styles xsi:type="notation:TitleStyle" xmi:id="_jtjFFJwUEeidac_mNnugIw"/>
-      <styles xsi:type="notation:SortingStyle" xmi:id="_jtjFFZwUEeidac_mNnugIw"/>
-      <styles xsi:type="notation:FilteringStyle" xmi:id="_jtjFFpwUEeidac_mNnugIw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jtjFF5wUEeidac_mNnugIw"/>
-    </children>
-    <element href="TapiNotification.uml#_YE76AJAdEei1rofSed2vtg"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jtieAZwUEeidac_mNnugIw" x="1082" y="589" height="84"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s3c4cINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s3c4cYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s3dfgINiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiCommon.uml#_xEvjkN8AEeW-BtRsuJPbqg"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s3c4coNiEeqLl4tIPv2RCg" x="671" y="244"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s33IIINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s33IIYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s33II4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_phsNMCzxEeaYO8M_h7XJ5A"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s33IIoNiEeqLl4tIPv2RCg" x="222" y="522"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s4n9IINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s4n9IYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s4n9I4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_oVDs4CzvEeaYO8M_h7XJ5A"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s4n9IoNiEeqLl4tIPv2RCg" x="261" y="232"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s5W88INiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s5W88YNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5W884NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_rZ7rwCzyEeaYO8M_h7XJ5A"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s5W88oNiEeqLl4tIPv2RCg" x="261" y="132"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s5h8EINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s5h8EYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5ijIINiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_Nsg9cE8cEea3rq3M7G3w3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s5h8EoNiEeqLl4tIPv2RCg" x="261" y="132"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s5_PEINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s5_PEYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5_PE4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_7CEIsC1qEeair-8ZDvf8jw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s5_PEoNiEeqLl4tIPv2RCg" x="522" y="468"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s7RBcINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s7RBcYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s7V58INiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s7RBcoNiEeqLl4tIPv2RCg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s7fq8INiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s7fq8YNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s7fq84NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_Hh5YECB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s7fq8oNiEeqLl4tIPv2RCg" x="522" y="368"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s7tGUINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s7tGUYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s7tGU4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_2HbQwC0UEeah7qIgVNfKeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s7tGUoNiEeqLl4tIPv2RCg" x="196" y="-115"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s8M1kINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s8M1kYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s8M1k4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_aQ9x8E8bEea3rq3M7G3w3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s8M1koNiEeqLl4tIPv2RCg" x="258" y="707"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s8nsUINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s8nsUYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s8nsU4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_mWGkkMh5EeaVlemTikmRHw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s8nsUoNiEeqLl4tIPv2RCg" x="387" y="75"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s88ccINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s88ccYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s88cc4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_qrNLMBM5Eee0L_IMWjydgQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s88ccoNiEeqLl4tIPv2RCg" x="387" y="-25"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s9E_UINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s9E_UYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s9FmYINiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_weSVgMh5EeaVlemTikmRHw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9E_UoNiEeqLl4tIPv2RCg" x="387" y="-25"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s9RMkINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s9RMkYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s9RMk4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_AGv4IMh6EeaVlemTikmRHw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9RMkoNiEeqLl4tIPv2RCg" x="387" y="-25"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s-GTAINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s-GTAYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s-GTA4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s-GTAoNiEeqLl4tIPv2RCg" x="911" y="83"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s-acEINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s-acEYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s-acE4NiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_K1S7ICCCEeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s-acEoNiEeqLl4tIPv2RCg" x="388" y="848"/>
-  </children>
-  <children xsi:type="notation:Shape" xmi:id="_s-3vEINiEeqLl4tIPv2RCg" type="StereotypeComment">
-    <styles xsi:type="notation:TitleStyle" xmi:id="_s-3vEYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s-4WIINiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_MQft0CCCEeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s-3vEoNiEeqLl4tIPv2RCg" x="679" y="847"/>
-  </children>
-  <styles xsi:type="notation:StringValueStyle" xmi:id="_tIFpETBHEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-  <styles xsi:type="notation:DiagramStyle" xmi:id="_tIFpEjBHEeam35bpdXJzEw"/>
-  <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_dbCJcIuSEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-    <owner href="TapiNotification.uml#_xbgioC5xEea0_JngOlSKcA"/>
-  </styles>
-  <element href="TapiNotification.uml#_xbgioC5xEea0_JngOlSKcA"/>
-  <edges xsi:type="notation:Connector" xmi:id="_4ANK0dwtEeaaobmDldrjOQ" type="StereotypeCommentLink" target="_4AKukNwtEeaaobmDldrjOQ">
-    <styles xsi:type="notation:FontStyle" xmi:id="_4ANK0twtEeaaobmDldrjOQ"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4ANx4twtEeaaobmDldrjOQ" name="BASE_ELEMENT"/>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4ANK09wtEeaaobmDldrjOQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4ANx4NwtEeaaobmDldrjOQ"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4ANx4dwtEeaaobmDldrjOQ"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_oASyj_LfEeaAIfPpmDwI5Q" type="StereotypeCommentLink" target="_oASyi_LfEeaAIfPpmDwI5Q">
-    <styles xsi:type="notation:FontStyle" xmi:id="_oASykPLfEeaAIfPpmDwI5Q"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oASylPLfEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oASykfLfEeaAIfPpmDwI5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oASykvLfEeaAIfPpmDwI5Q"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oASyk_LfEeaAIfPpmDwI5Q"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_qsWasBM5Eee0L_IMWjydgQ" type="Abstraction_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_oDXmQBM5Eee0L_IMWjydgQ">
-    <children xsi:type="notation:DecorationNode" xmi:id="_qsWasxM5Eee0L_IMWjydgQ" type="Abstraction_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_qsWatBM5Eee0L_IMWjydgQ" x="-2" y="-10"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_qsWatRM5Eee0L_IMWjydgQ" type="Abstraction_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_qsWathM5Eee0L_IMWjydgQ" x="-10" y="10"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_qsWasRM5Eee0L_IMWjydgQ"/>
-    <element href="TapiNotification.uml#_qrNLMBM5Eee0L_IMWjydgQ"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qsWashM5Eee0L_IMWjydgQ" points="[36, 1, -216, -7]$[241, 4, -11, -4]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_quqH0BM5Eee0L_IMWjydgQ" id="(1.0,0.5135135135135135)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_quqH0RM5Eee0L_IMWjydgQ" id="(0.0,0.29)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_g4ChwFrnEeexvMtO2oNM9g" type="InterfaceRealization_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_whMV2zBHEeam35bpdXJzEw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_g4Chw1rnEeexvMtO2oNM9g" type="InterfaceRealization_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_g4ChxFrnEeexvMtO2oNM9g" y="40"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_g4ChxVrnEeexvMtO2oNM9g" type="InterfaceRealization_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_g4ChxlrnEeexvMtO2oNM9g" y="60"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_g4ChwVrnEeexvMtO2oNM9g"/>
-    <element href="TapiNotification.uml#_g1uNkFrnEeexvMtO2oNM9g"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_g4ChwlrnEeexvMtO2oNM9g" points="[0, 0, 85, 33]$[-85, 0, 0, 33]$[-85, -33, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_g7F1wFrnEeexvMtO2oNM9g" id="(0.0,0.24324324324324326)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_g7F1wVrnEeexvMtO2oNM9g" id="(0.09098712446351931,1.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_27UFwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_whMS9zBHEeam35bpdXJzEw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_27UFw4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFxIuSEeiu6boZkiJHCA" x="9" y="-1"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_27UFxYuSEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFxouSEeiu6boZkiJHCA" x="-11"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_27UFx4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFyIuSEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_27UFyYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFyouSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_27UFy4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_27Us0IuSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_27Us0YuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_27Us0ouSEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_27UFwYuSEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_weSVgMh5EeaVlemTikmRHw"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_27UFwouSEeiu6boZkiJHCA" points="[322, 149, -643984, -643984]$[269, 232, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_44SIwIuSEeiu6boZkiJHCA" id="(0.10344827586206896,1.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_5zVbwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_whMUSDBHEeam35bpdXJzEw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_5zWC0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC0YuSEeiu6boZkiJHCA" x="-106" y="-4"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5zWC0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC04uSEeiu6boZkiJHCA" x="-122" y="-4"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5zWC1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC1YuSEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5zWC1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC14uSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5zWC2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC2YuSEeiu6boZkiJHCA" x="-38" y="15"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_5zWC2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC24uSEeiu6boZkiJHCA" x="36" y="-18"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_5zVbwYuSEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_AGv4IMh6EeaVlemTikmRHw"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_5zVbwouSEeiu6boZkiJHCA" points="[354, 149, -643984, -643984]$[427, 468, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6y-64IuSEeiu6boZkiJHCA" id="(0.8589341692789969,1.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_9GaWEIuSEeiu6boZkiJHCA" type="Association_Edge" source="_whMS9zBHEeam35bpdXJzEw" target="_whCixzBHEeam35bpdXJzEw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_9GaWE4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWFIuSEeiu6boZkiJHCA" x="-4" y="1"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_9GaWFYuSEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWFouSEeiu6boZkiJHCA" x="-24" y="6"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_9GaWF4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWGIuSEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_9GaWGYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWGouSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_9GaWG4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_9Ga9IIuSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_9Ga9IYuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_9Ga9IouSEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_9GaWEYuSEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_rZ7rwCzyEeaYO8M_h7XJ5A"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_9GaWEouSEeiu6boZkiJHCA" points="[199, 406, -643984, -643984]$[180, 522, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-Cu0YIuSEeiu6boZkiJHCA" id="(0.1111111111111111,1.0)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-mUpoIuSEeiu6boZkiJHCA" id="(0.25,0.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="__rY0QIuSEeiu6boZkiJHCA" type="Association_Edge" source="_whMS9zBHEeam35bpdXJzEw" target="_q_PtIE8bEea3rq3M7G3w3w">
-    <children xsi:type="notation:DecorationNode" xmi:id="__rZbUIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbUYuSEeiu6boZkiJHCA" x="-54" y="2"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="__rZbUouSEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbU4uSEeiu6boZkiJHCA" x="-72" y="-9"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="__rZbVIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbVYuSEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="__rZbVouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbV4uSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="__rZbWIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbWYuSEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="__rZbWouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbW4uSEeiu6boZkiJHCA" x="33" y="18"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="__rY0QYuSEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_Nsg9cE8cEea3rq3M7G3w3w"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__rY0QouSEeiu6boZkiJHCA" points="[202, 406, -643984, -643984]$[161, 707, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_CZCGQIuTEeiu6boZkiJHCA" id="(0.4673202614379085,1.0)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_BcYQwIuTEeiu6boZkiJHCA" id="(0.7448979591836735,0.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_EOmgwIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMS9zBHEeam35bpdXJzEw" target="_whMUSDBHEeam35bpdXJzEw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_EOmgw4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_EOmgxIuTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_EOmgxYuTEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_EOmgxouTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_EOnH0IuTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH0YuTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_EOnH0ouTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH04uTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_EOnH1IuTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH1YuTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_EOnH1ouTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH14uTEeiu6boZkiJHCA" x="-2" y="19"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_EOmgwYuTEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_5oI2cC1sEeair-8ZDvf8jw"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EOmgwouTEeiu6boZkiJHCA" points="[286, 406, -643984, -643984]$[337, 468, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FbcHUIuTEeiu6boZkiJHCA" id="(0.954248366013072,1.0)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_F3tMkIuTEeiu6boZkiJHCA" id="(0.1111111111111111,0.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_Hmx9gIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMUSDBHEeam35bpdXJzEw" target="_whCiJjBHEeam35bpdXJzEw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_HmykkIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_HmykkYuTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_HmykkouTEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_Hmykk4uTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_HmyklIuTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLoIuTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_HmzLoYuTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLoouTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_HmzLo4uTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLpIuTEeiu6boZkiJHCA" x="-9" y="-13"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_HmzLpYuTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLpouTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_Hmx9gYuTEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_kFsxgE8SEea3rq3M7G3w3w"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hmx9gouTEeiu6boZkiJHCA" points="[504, 468, -643984, -643984]$[544, 328, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IuBSYIuTEeiu6boZkiJHCA" id="(0.8530465949820788,0.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_KIyAMIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMUSDBHEeam35bpdXJzEw" target="_K1csICCCEeeWCKlkirNtnw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_KIyAM4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyANIuTEeiu6boZkiJHCA" x="9"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_KIyANYuTEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyANouTEeiu6boZkiJHCA" x="-9" y="-1"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_KIyAN4uTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAOIuTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_KIyAOYuTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAOouTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_KIyAO4uTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAPIuTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_KIyAPYuTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAPouTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_KIyAMYuTEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_KIyAMouTEeiu6boZkiJHCA" points="[390, 768, -643984, -643984]$[353, 848, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LEbwIIuTEeiu6boZkiJHCA" id="(0.06093189964157706,1.0)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LhOZ0IuTEeiu6boZkiJHCA" id="(0.5431654676258992,0.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_PeKJcIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMUSDBHEeam35bpdXJzEw" target="_MQpe0SCCEeeWCKlkirNtnw">
-    <children xsi:type="notation:DecorationNode" xmi:id="_PeKJc4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJdIuTEeiu6boZkiJHCA" x="5" y="8"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_PeKJdYuTEeiu6boZkiJHCA" type="Association_NameLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJdouTEeiu6boZkiJHCA" x="-12" y="19"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_PeKJd4uTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJeIuTEeiu6boZkiJHCA" y="-20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_PeKJeYuTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJeouTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_PeKJe4uTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJfIuTEeiu6boZkiJHCA" y="20"/>
-    </children>
-    <children xsi:type="notation:DecorationNode" xmi:id="_PeKJfYuTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJfouTEeiu6boZkiJHCA" x="1" y="19"/>
-    </children>
-    <styles xsi:type="notation:FontStyle" xmi:id="_PeKJcYuTEeiu6boZkiJHCA"/>
-    <element href="TapiNotification.uml#_Hh5YECB_EeeWCKlkirNtnw"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PeKJcouTEeiu6boZkiJHCA" points="[544, 768, -643984, -643984]$[587, 847, -643984, -643984]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SldRkIuTEeiu6boZkiJHCA" id="(0.8422939068100358,1.0)"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Qbjl0IuTEeiu6boZkiJHCA" id="(0.2903225806451613,0.0)"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s3dfgYNiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_whCiJjBHEeam35bpdXJzEw" target="_s3c4cINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s3dfgoNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s3dfhoNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiCommon.uml#_xEvjkN8AEeW-BtRsuJPbqg"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s3dfg4NiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s3dfhINiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s3dfhYNiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s33IJINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_whCixzBHEeam35bpdXJzEw" target="_s33IIINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s33IJYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s33IKYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_phsNMCzxEeaYO8M_h7XJ5A"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s33IJoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s33IJ4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s33IKINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s4n9JINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_whMS9zBHEeam35bpdXJzEw" target="_s4n9IINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s4n9JYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s4n9KYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_oVDs4CzvEeaYO8M_h7XJ5A"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s4n9JoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s4n9J4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s4n9KINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s5W89INiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_9GaWEIuSEeiu6boZkiJHCA" target="_s5W88INiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s5W89YNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5W8-YNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_rZ7rwCzyEeaYO8M_h7XJ5A"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s5W89oNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5W894NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5W8-INiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s5ijIYNiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="__rY0QIuSEeiu6boZkiJHCA" target="_s5h8EINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s5ijIoNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5ijJoNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_Nsg9cE8cEea3rq3M7G3w3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s5ijI4NiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5ijJINiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5ijJYNiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s5_PFINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_whMUSDBHEeam35bpdXJzEw" target="_s5_PEINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s5_PFYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s5_PGYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_7CEIsC1qEeair-8ZDvf8jw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s5_PFoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5_PF4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s5_PGINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s7V58YNiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_KIyAMIuTEeiu6boZkiJHCA" target="_s7RBcINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s7V58oNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s7V59oNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s7V584NiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s7V59INiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s7V59YNiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s7gSAINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_PeKJcIuTEeiu6boZkiJHCA" target="_s7fq8INiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s7gSAYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s7gSBYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_Hh5YECB_EeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s7gSAoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s7gSA4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s7gSBINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s7tGVINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_whMV2zBHEeam35bpdXJzEw" target="_s7tGUINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s7tGVYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s7tGWYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_2HbQwC0UEeah7qIgVNfKeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s7tGVoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s7tGV4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s7tGWINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s8M1lINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_q_PtIE8bEea3rq3M7G3w3w" target="_s8M1kINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s8M1lYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s8NcoINiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_aQ9x8E8bEea3rq3M7G3w3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s8M1loNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s8M1l4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s8M1mINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s8nsVINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_mX0b0Mh5EeaVlemTikmRHw" target="_s8nsUINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s8nsVYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s8nsWYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_mWGkkMh5EeaVlemTikmRHw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s8nsVoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s8nsV4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s8nsWINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s88cdINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_qsWasBM5Eee0L_IMWjydgQ" target="_s88ccINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s88cdYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s89DgINiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_qrNLMBM5Eee0L_IMWjydgQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s88cdoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s88cd4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s88ceINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s9FmYYNiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_27UFwIuSEeiu6boZkiJHCA" target="_s9E_UINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s9FmYoNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s9FmZoNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_weSVgMh5EeaVlemTikmRHw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s9FmY4NiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s9FmZINiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s9FmZYNiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s9RzoINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_5zVbwIuSEeiu6boZkiJHCA" target="_s9RMkINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s9RzoYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s9RzpYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_AGv4IMh6EeaVlemTikmRHw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s9RzooNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s9Rzo4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s9RzpINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s-GTBINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_oDXmQBM5Eee0L_IMWjydgQ" target="_s-GTAINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s-GTBYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s-GTCYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s-GTBoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s-GTB4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s-GTCINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s-acFINiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_K1csICCCEeeWCKlkirNtnw" target="_s-acEINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s-acFYNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s-acGYNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_K1S7ICCCEeeWCKlkirNtnw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s-acFoNiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s-acF4NiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s-acGINiEeqLl4tIPv2RCg"/>
-  </edges>
-  <edges xsi:type="notation:Connector" xmi:id="_s-4WIYNiEeqLl4tIPv2RCg" type="StereotypeCommentLink" source="_MQpe0SCCEeeWCKlkirNtnw" target="_s-3vEINiEeqLl4tIPv2RCg">
-    <styles xsi:type="notation:FontStyle" xmi:id="_s-4WIoNiEeqLl4tIPv2RCg"/>
-    <styles xsi:type="notation:EObjectValueStyle" xmi:id="_s-4WJoNiEeqLl4tIPv2RCg" name="BASE_ELEMENT">
-      <eObjectValue href="TapiNotification.uml#_MQft0CCCEeeWCKlkirNtnw"/>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style">
+  <notation:Diagram xmi:id="_tIFpEDBHEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="NotificationServiceDetails" measurementUnit="Pixel">
+    <children xsi:type="notation:Shape" xmi:id="_whCh4DBHEeam35bpdXJzEw" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCh4TBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCh4jBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh4zBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCh5DBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_whCh5TBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_hZotiCzcEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh5jBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCh5zBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_qgPssCzcEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh6DBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCh6TBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_sa1KECzcEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCh6jBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_ptyUwOSWEeaMvo3u46vn9g" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_Hf-y4NwrEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ptyUweSWEeaMvo3u46vn9g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_pt-iAOSWEeaMvo3u46vn9g" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_JjUjoNwrEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_pt-iAeSWEeaMvo3u46vn9g"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCh7TBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCh7jBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCh7zBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCh8DBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_hZotgCzcEeaYO8M_h7XJ5A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCiAzBHEeam35bpdXJzEw" x="1040" y="380"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whCiBDBHEeam35bpdXJzEw" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCiBTBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCiBjBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiBzBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCiCDBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_whCiCTBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_ggplICzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiCjBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCiCzBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_h_dFcCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiDDBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCiDTBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_jrUKUCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiDjBHEeam35bpdXJzEw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCiDzBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCiEDBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCiETBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCiEjBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_bgwjsCzeEeaYO8M_h7XJ5A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCiJTBHEeam35bpdXJzEw" x="1000" y="600" height="91"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whCiJjBHEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCiJzBHEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCiKDBHEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiKTBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCiKjBHEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_whCiKzBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiSjBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCiSzBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiajBHEeam35bpdXJzEw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCiizBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCijDBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCijTBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCijjBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCijzBHEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCikDBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCikTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCikjBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCikzBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCilDBHEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCilTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCiljBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCilzBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCimDBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiCommon.uml#_xEvjkN8AEeW-BtRsuJPbqg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCixjBHEeam35bpdXJzEw" x="620" y="240" height="84"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whCixzBHEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCiyDBHEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whCiyTBHEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whCiyjBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCiyzBHEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_whCizDBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_8YhJQCzxEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCi6zBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCi7DBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#__0cdkCzxEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCjCzBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCjDDBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_FwOfgCzyEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCjKzBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whCjLDBHEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_KPrGUCzyEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whCjSzBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_0oxwAE8XEea3rq3M7G3w3w" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_q0nuUE8XEea3rq3M7G3w3w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_0oxwAU8XEea3rq3M7G3w3w"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_a8g7MBMtEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_a8g7MRMtEee0L_IMWjydgQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_a8g7MhMtEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_a8g7MxMtEee0L_IMWjydgQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCjTDBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCjTTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCjTjBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjTzBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCjUDBHEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCjUTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCjUjBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCjUzBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjVDBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whCjVTBHEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whCjVjBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whCjVzBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whCjWDBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjWTBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_phsNMCzxEeaYO8M_h7XJ5A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whCjhzBHEeam35bpdXJzEw" x="22" y="522" height="156"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whMS9zBHEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMS-DBHEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMS-TBHEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMS-jBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMS-zBHEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Z1XQ9MPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_5oI2dC1sEeair-8ZDvf8jw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ9cPQEeaiK6pYrNo12g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Z1XQ9sPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_Nsg9dE8cEea3rq3M7G3w3w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ98PQEeaiK6pYrNo12g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Z1XQ-MPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_rZ7rxCzyEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ-cPQEeaiK6pYrNo12g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Z1XQ-sPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_BeqnEC0bEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ-8PQEeaiK6pYrNo12g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Z1XQ_MPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_0iGcECzwEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ_cPQEeaiK6pYrNo12g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Z1XQ_sPQEeaiK6pYrNo12g" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_4HEXoCzwEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Z1XQ_8PQEeaiK6pYrNo12g"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_gM0K8NwpEeaaobmDldrjOQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_gM0K8dwpEeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_gM0K8twpEeaaobmDldrjOQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_gM0K89wpEeaaobmDldrjOQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMTnDBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMTnTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMTnjBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMTnzBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMToDBHEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMToTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMTojBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMTozBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMTpDBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMTpTBHEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMTpjBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMTpzBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMTqDBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMTqTBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_oVDs4CzvEeaYO8M_h7XJ5A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMT1zBHEeam35bpdXJzEw" x="61" y="232" height="174"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whMT4jBHEeam35bpdXJzEw" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMT4zBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMT5DBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMT5TBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMT5jBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_whMT5zBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_0ThbcC0aEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMT6DBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMT6TBHEeam35bpdXJzEw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_1QrAMC0aEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMT6jBHEeam35bpdXJzEw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMT6zBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMT7DBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMT7TBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMT7jBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_Rjd84C0aEeah7qIgVNfKeA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMUATBHEeam35bpdXJzEw" x="760" y="1040" height="82"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whMUAjBHEeam35bpdXJzEw" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMUAzBHEeam35bpdXJzEw" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMUBDBHEeam35bpdXJzEw" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMUBTBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMUBjBHEeam35bpdXJzEw" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_e2YzwBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_Jsw9oCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2YzwRNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2Za0BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_KpUFcCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2Za0RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2aB4BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_LaJFcCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB4RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2aB4hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_MakAoCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB4xNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2aB5BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_NRwuYCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB5RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2aB5hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_OxHoUCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB5xNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2aB6BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_RB-QoCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2aB6RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ao8BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_SlD0ACzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao8RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ao8hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_UVnLoCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao8xNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ao9BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_Vq3uYCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao9RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ao9hNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_XRFeQCzeEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao9xNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ao-BNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#__WB2QBNXEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ao-RNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2bQABNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_CILNwBNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQARNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2bQAhNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_EpIHkBNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQAxNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2bQBBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_GI_-4BNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQBRNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2bQBhNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_vV3I0BNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2bQBxNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2bQCBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_wPccMBNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2b3EBNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2b3ERNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_xSSZQBNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2b3EhNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ceIBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_MKoKIBNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ceIRNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ceIhNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_Na--wBNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ceIxNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2ceJBNaEeiKtYjI8wVF7A" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_tPnOABNYEeiKtYjI8wVF7A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2ceJRNaEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_wRLNUINiEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_vfVu8JAdEei1rofSed2vtg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_wRLNUYNiEeqLl4tIPv2RCg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N3GJUINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_DnT7kINjEeqLl4tIPv2RCg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N3GJUYNjEeqLl4tIPv2RCg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N3GwYINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_FbKe0INjEeqLl4tIPv2RCg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N3GwYYNjEeqLl4tIPv2RCg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N3HXcINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_HWLaAINjEeqLl4tIPv2RCg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N3HXcYNjEeqLl4tIPv2RCg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N3HXcoNjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_I66jMINjEeqLl4tIPv2RCg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N3HXc4NjEeqLl4tIPv2RCg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N3H-gINjEeqLl4tIPv2RCg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_K44EsINjEeqLl4tIPv2RCg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N3H-gYNjEeqLl4tIPv2RCg"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMUHTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMUHjBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMUHzBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMUIDBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_FFtS8CzeEeaYO8M_h7XJ5A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMUMzBHEeam35bpdXJzEw" x="1520" y="200"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whMUSDBHEeam35bpdXJzEw" type="Signal_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMUSTBHEeam35bpdXJzEw" type="Signal_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMUSjBHEeam35bpdXJzEw" type="Signal_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMUSzBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMUTDBHEeam35bpdXJzEw" type="Signal_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_LzON4CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#__HbVoCzoEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON4SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON4iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_RH-xACzpEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON4yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON5CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_TLUZYE8lEea3rq3M7G3w3w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON5SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON5iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_fbcaICzqEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON5yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON6CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_p0dcYCzqEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON6SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON6iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_9CxHgE8cEea3rq3M7G3w3w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON6yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON7CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_virjcCzqEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON7SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzON7iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_gu8iACztEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzON7yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX0CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_u53agCzrEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX0SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX0iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_3CrUsCzrEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX0yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX1CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_x4d5oCzrEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX1SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX1iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_Hh5YEyB_EeeWCKlkirNtnw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX1yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX2CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiNotification.uml#_HA6K4yB_EeeWCKlkirNtnw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX2SCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX2iCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX2yCAEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_LzXX3CCAEeeWCKlkirNtnw" type="Property_SignalAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LzXX3SCAEeeWCKlkirNtnw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMVrTBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMVrjBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMVrzBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMVsDBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_7CEIsC1qEeair-8ZDvf8jw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMV2jBHEeam35bpdXJzEw" x="322" y="440" height="461"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_whMV2zBHEeam35bpdXJzEw" type="Interface_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMV3DBHEeam35bpdXJzEw" type="Interface_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_whMV3TBHEeam35bpdXJzEw" type="Interface_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_whMV3jBHEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMV3zBHEeam35bpdXJzEw" type="Interface_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMV4DBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMV4TBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMV4jBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMV4zBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMV5DBHEeam35bpdXJzEw" type="Interface_OperationCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_whMV5TBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMV5jBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_1JlTAC0VEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMV_zBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMWADBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWATBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_2Iz7YC0VEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWGjBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMWGzBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWHDBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_Sgs2oC0ZEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWNTBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMWNjBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWNzBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_o5NJsC0ZEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWUDBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMWUTBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWUjBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_BDuFkC0dEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWazBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMWbDBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWbTBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_MQ03MC0dEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWhjBHEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_whMWhzBHEeam35bpdXJzEw" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_whMWiDBHEeam35bpdXJzEw" name="maskLabel">
+            <stringListValue>parametersName</stringListValue>
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>parametersMultiplicity</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>parametersType</stringListValue>
+          </styles>
+          <element href="TapiNotification.uml#_SumL4C0dEeah7qIgVNfKeA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_whMWoTBHEeam35bpdXJzEw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMWojBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMWozBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMWpDBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMWpTBHEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_whMWpjBHEeam35bpdXJzEw" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_whMWpzBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_whMWqDBHEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_whMWqTBHEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMWqjBHEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiNotification.uml#_2HbQwC0UEeah7qIgVNfKeA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_whMW0DBHEeam35bpdXJzEw" x="-4" y="-200" height="260"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_wiFD0DBHEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wiFD0TBHEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wiFD0zBHEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_5oI2cC1sEeair-8ZDvf8jw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wiFD0jBHEeam35bpdXJzEw" x="395" y="135"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kaYoEE8SEea3rq3M7G3w3w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kaYoEU8SEea3rq3M7G3w3w" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kaYoE08SEea3rq3M7G3w3w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_kFsxgE8SEea3rq3M7G3w3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kaYoEk8SEea3rq3M7G3w3w" x="609" y="372"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_q_PtIE8bEea3rq3M7G3w3w" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_q_PtIk8bEea3rq3M7G3w3w" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_q_PtI08bEea3rq3M7G3w3w" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_q_PtJE8bEea3rq3M7G3w3w" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q_PtJU8bEea3rq3M7G3w3w" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_MvhJsE8cEea3rq3M7G3w3w" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_xvMMYE8aEea3rq3M7G3w3w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MvhJsU8cEea3rq3M7G3w3w"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_MvhJsk8cEea3rq3M7G3w3w" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_LYuLUE8bEea3rq3M7G3w3w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MvhJs08cEea3rq3M7G3w3w"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q_PtJk8bEea3rq3M7G3w3w"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q_PtJ08bEea3rq3M7G3w3w"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q_PtKE8bEea3rq3M7G3w3w"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtKU8bEea3rq3M7G3w3w"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q_PtKk8bEea3rq3M7G3w3w" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q_PtK08bEea3rq3M7G3w3w"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q_PtLE8bEea3rq3M7G3w3w"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q_PtLU8bEea3rq3M7G3w3w"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtLk8bEea3rq3M7G3w3w"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q_PtL08bEea3rq3M7G3w3w" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q_PtME8bEea3rq3M7G3w3w"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q_PtMU8bEea3rq3M7G3w3w"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q_PtMk8bEea3rq3M7G3w3w"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtM08bEea3rq3M7G3w3w"/>
+      </children>
+      <element href="TapiNotification.uml#_aQ9x8E8bEea3rq3M7G3w3w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q_PtIU8bEea3rq3M7G3w3w" x="58" y="707" width="196" height="76"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_mX0b0Mh5EeaVlemTikmRHw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_mX0b0sh5EeaVlemTikmRHw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_mX0b08h5EeaVlemTikmRHw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mX0b1Mh5EeaVlemTikmRHw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_mX0b1ch5EeaVlemTikmRHw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Pk8rgsh6EeaVlemTikmRHw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_weSVhMh5EeaVlemTikmRHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Pk8rg8h6EeaVlemTikmRHw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Pk8rhMh6EeaVlemTikmRHw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_AGv4JMh6EeaVlemTikmRHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Pk8rhch6EeaVlemTikmRHw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_mX0b1sh5EeaVlemTikmRHw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_mX0b18h5EeaVlemTikmRHw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_mX0b2Mh5EeaVlemTikmRHw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b2ch5EeaVlemTikmRHw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_mX0b2sh5EeaVlemTikmRHw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_mX0b28h5EeaVlemTikmRHw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_mX0b3Mh5EeaVlemTikmRHw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_mX0b3ch5EeaVlemTikmRHw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b3sh5EeaVlemTikmRHw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_mX0b38h5EeaVlemTikmRHw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_mX0b4Mh5EeaVlemTikmRHw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_mX0b4ch5EeaVlemTikmRHw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_mX0b4sh5EeaVlemTikmRHw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b48h5EeaVlemTikmRHw"/>
+      </children>
+      <element href="TapiNotification.uml#_mWGkkMh5EeaVlemTikmRHw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mX0b0ch5EeaVlemTikmRHw" x="187" y="75" height="74"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_a_-dMNwqEeaaobmDldrjOQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_a_-dMtwqEeaaobmDldrjOQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_a_-dM9wqEeaaobmDldrjOQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_a_-dNNwqEeaaobmDldrjOQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_a_-dNdwqEeaaobmDldrjOQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_c6ozENwqEeaaobmDldrjOQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiNotification.uml#__Pe64iznEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c6ozEdwqEeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c6ozEtwqEeaaobmDldrjOQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiNotification.uml#__Pe65iznEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c6ozE9wqEeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c6ozFNwqEeaaobmDldrjOQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiNotification.uml#_E_LBkCzoEeaYO8M_h7XJ5A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c6ozFdwqEeaaobmDldrjOQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_a_-dNtwqEeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_a_-dN9wqEeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_a_-dONwqEeaaobmDldrjOQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a_-dOdwqEeaaobmDldrjOQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_a_-dOtwqEeaaobmDldrjOQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_a_-dO9wqEeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_a_-dPNwqEeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_a_-dPdwqEeaaobmDldrjOQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a_-dPtwqEeaaobmDldrjOQ"/>
+      </children>
+      <element href="TapiNotification.uml#__Pe64CznEeaYO8M_h7XJ5A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_a_-dMdwqEeaaobmDldrjOQ" x="960" y="720" height="99"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_4AKukNwtEeaaobmDldrjOQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_4AKukdwtEeaaobmDldrjOQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4ANK0NwtEeaaobmDldrjOQ" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4AKuktwtEeaaobmDldrjOQ" x="200"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_7YJXA9wtEeaaobmDldrjOQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7YJXBNwtEeaaobmDldrjOQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7YJXBtwtEeaaobmDldrjOQ" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7YJXBdwtEeaaobmDldrjOQ" x="858" y="627"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_5B2mUNwzEeaaobmDldrjOQ" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_5B3NYNwzEeaaobmDldrjOQ" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5B3NYdwzEeaaobmDldrjOQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5B3NYtwzEeaaobmDldrjOQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_5B30cNwzEeaaobmDldrjOQ" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Fc0SMNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_-WiMANwzEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc0SMdw0EeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Fc05QNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_9MhP8NwzEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc05Qdw0EeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Fc05Qtw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#__wAgYNwzEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc05Q9w0EeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Fc05RNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_At-kgNw0EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc05Rdw0EeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Fc1gUNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_C8cnMNw0EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Fc1gUdw0EeaaobmDldrjOQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_5B30cdwzEeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_5B30ctwzEeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_5B30c9wzEeaaobmDldrjOQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5B30dNwzEeaaobmDldrjOQ"/>
+      </children>
+      <element href="TapiNotification.uml#_5ByU4NwzEeaaobmDldrjOQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5B2mUdwzEeaaobmDldrjOQ" x="1300" y="720"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_GocX0Nw0EeaaobmDldrjOQ" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Goc-4Nw0EeaaobmDldrjOQ" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Goc-4dw0EeaaobmDldrjOQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Goc-4tw0EeaaobmDldrjOQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Goc-49w0EeaaobmDldrjOQ" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_g9mGoNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_NckXANw0EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_g9mGodw0EeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_g9mtsNw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_Oy87INw0EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_g9mtsdw0EeaaobmDldrjOQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_g9mtstw0EeaaobmDldrjOQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_V171sNw0EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_g9mts9w0EeaaobmDldrjOQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Goc-5Nw0EeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Goc-5dw0EeaaobmDldrjOQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Goc-5tw0EeaaobmDldrjOQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Goc-59w0EeaaobmDldrjOQ"/>
+      </children>
+      <element href="TapiNotification.uml#_GoZUgNw0EeaaobmDldrjOQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GocX0dw0EeaaobmDldrjOQ" x="980" y="960"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_291_09w2EeaaobmDldrjOQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_291_1Nw2EeaaobmDldrjOQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_291_1tw2EeaaobmDldrjOQ" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_291_1dw2EeaaobmDldrjOQ" x="697" y="721"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_5ZhnIOcCEeaDNtnUN91VDg" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_5ZkqcOcCEeaDNtnUN91VDg" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5ZkqcecCEeaDNtnUN91VDg" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5ZkqcucCEeaDNtnUN91VDg" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_5Zkqc-cCEeaDNtnUN91VDg" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_IOqPYOcDEeaDNtnUN91VDg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_D2NBYOcDEeaDNtnUN91VDg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_IOqPYecDEeaDNtnUN91VDg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_IOq2cOcDEeaDNtnUN91VDg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_FvNKYOcDEeaDNtnUN91VDg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_IOq2cecDEeaDNtnUN91VDg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_IOrdgOcDEeaDNtnUN91VDg" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_HCD5YOcDEeaDNtnUN91VDg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_IOrdgecDEeaDNtnUN91VDg"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_5ZkqdOcCEeaDNtnUN91VDg"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_5ZkqdecCEeaDNtnUN91VDg"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_5ZkqducCEeaDNtnUN91VDg"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5Zkqd-cCEeaDNtnUN91VDg"/>
+      </children>
+      <element href="TapiNotification.uml#_5QUAwOcCEeaDNtnUN91VDg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5ZhnIecCEeaDNtnUN91VDg" x="1220" y="940"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_oASyi_LfEeaAIfPpmDwI5Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_oASyjPLfEeaAIfPpmDwI5Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oASyjvLfEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oASyjfLfEeaAIfPpmDwI5Q" x="200"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_oDXmQBM5Eee0L_IMWjydgQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_oDXmQhM5Eee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_oDXmQxM5Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oDXmRBM5Eee0L_IMWjydgQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_oDXmRRM5Eee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_oDXmRhM5Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_oDXmRxM5Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_oDXmSBM5Eee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmSRM5Eee0L_IMWjydgQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_oDXmShM5Eee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_oDXmSxM5Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_oDXmTBM5Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_oDXmTRM5Eee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmThM5Eee0L_IMWjydgQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_oDXmTxM5Eee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_oDXmUBM5Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_oDXmURM5Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_oDXmUhM5Eee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmUxM5Eee0L_IMWjydgQ"/>
+      </children>
+      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oDXmQRM5Eee0L_IMWjydgQ" x="711" y="83"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_K1csICCCEeeWCKlkirNtnw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_K1csIiCCEeeWCKlkirNtnw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_K1csIyCCEeeWCKlkirNtnw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_K1csJCCCEeeWCKlkirNtnw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_K1csJSCCEeeWCKlkirNtnw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_agQYICCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_xC-10Nw0EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYISCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_agQYIiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_FcWm4NwuEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYIyCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_agQYJCCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_DIyo0NwuEeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYJSCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_agQYJiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_f0a_wOcDEeaDNtnUN91VDg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_agQYJyCCEeeWCKlkirNtnw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_K1csJiCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_K1csJyCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_K1csKCCCEeeWCKlkirNtnw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csKSCCEeeWCKlkirNtnw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_K1csKiCCEeeWCKlkirNtnw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_K1csKyCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_K1csLCCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_K1csLSCCEeeWCKlkirNtnw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csLiCCEeeWCKlkirNtnw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_K1csLyCCEeeWCKlkirNtnw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_K1csMCCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_K1csMSCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_K1csMiCCEeeWCKlkirNtnw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csMyCCEeeWCKlkirNtnw"/>
+      </children>
+      <element href="TapiNotification.uml#_K1S7ICCCEeeWCKlkirNtnw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_K1csISCCEeeWCKlkirNtnw" x="60" y="960" height="111"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_MQpe0SCCEeeWCKlkirNtnw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_MQpe0yCCEeeWCKlkirNtnw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_MQpe1CCCEeeWCKlkirNtnw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MQpe1SCCEeeWCKlkirNtnw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_MQpe1iCCEeeWCKlkirNtnw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_cdruICCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_1iNvUNw2EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruISCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_cdruIiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_x-5ZkNw2EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruIyCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_cdruJCCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#__1HX8Nw1EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruJSCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_cdruJiCCEeeWCKlkirNtnw" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_nJFtoNw2EeaaobmDldrjOQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cdruJyCCEeeWCKlkirNtnw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_JpYPYJAdEei1rofSed2vtg" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_JfqSsJAdEei1rofSed2vtg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_JpYPYZAdEei1rofSed2vtg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_ckw7UJAdEei1rofSed2vtg" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_cdDw0JAdEei1rofSed2vtg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ckw7UZAdEei1rofSed2vtg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_9dH4cJAdEei1rofSed2vtg" type="Property_ClassAttributeLabel">
+          <element href="TapiNotification.uml#_9VXDkJAdEei1rofSed2vtg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9dH4cZAdEei1rofSed2vtg"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_MQpe1yCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_MQpe2CCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_MQpe2SCCEeeWCKlkirNtnw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe2iCCEeeWCKlkirNtnw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_MQpe2yCCEeeWCKlkirNtnw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_MQpe3CCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_MQpe3SCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_MQpe3iCCEeeWCKlkirNtnw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe3yCCEeeWCKlkirNtnw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_MQpe4CCCEeeWCKlkirNtnw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_MQpe4SCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_MQpe4iCCEeeWCKlkirNtnw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_MQpe4yCCEeeWCKlkirNtnw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe5CCCEeeWCKlkirNtnw"/>
+      </children>
+      <element href="TapiNotification.uml#_MQft0CCCEeeWCKlkirNtnw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MQpe0iCCEeeWCKlkirNtnw" x="540" y="940" height="134"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__1VZoFDREeeINtPz0JX6oA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="__1VZoVDREeeINtPz0JX6oA"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__1VZo1DREeeINtPz0JX6oA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__1VZolDREeeINtPz0JX6oA" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ChzhwFqoEeexvMtO2oNM9g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ChzhwVqoEeexvMtO2oNM9g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Chzhw1qoEeexvMtO2oNM9g" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ChzhwlqoEeexvMtO2oNM9g" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_DO0_0FqoEeexvMtO2oNM9g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DO0_0VqoEeexvMtO2oNM9g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DO0_01qoEeexvMtO2oNM9g" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DO0_0lqoEeexvMtO2oNM9g" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_DPr7cFqoEeexvMtO2oNM9g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_DPr7cVqoEeexvMtO2oNM9g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_DPr7c1qoEeexvMtO2oNM9g" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DPr7clqoEeexvMtO2oNM9g" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_bx5HUFrnEeexvMtO2oNM9g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bx5HUVrnEeexvMtO2oNM9g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bx5HU1rnEeexvMtO2oNM9g" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bx5HUlrnEeexvMtO2oNM9g" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_kq-EoMrkEeeFHsPqdArtwA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kq-EocrkEeeFHsPqdArtwA" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kq-Eo8rkEeeFHsPqdArtwA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kq-EosrkEeeFHsPqdArtwA" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_MKUj48rlEeeFHsPqdArtwA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_MKUj5MrlEeeFHsPqdArtwA" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_MKUj5srlEeeFHsPqdArtwA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MKUj5crlEeeFHsPqdArtwA" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_xKIQMO_UEee2fqmozVFruQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_xKIQMe_UEee2fqmozVFruQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_xKIQM-_UEee2fqmozVFruQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xKIQMu_UEee2fqmozVFruQ" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_aA6sEBEJEeix4OZk6OGmSg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_aA6sEREJEeix4OZk6OGmSg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aA6sExEJEeix4OZk6OGmSg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aA6sEhEJEeix4OZk6OGmSg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_nPpcQBJ_Eeix4OZk6OGmSg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_nPpcQRJ_Eeix4OZk6OGmSg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nPpcQxJ_Eeix4OZk6OGmSg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nPpcQhJ_Eeix4OZk6OGmSg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ecplcBNXEeiKtYjI8wVF7A" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ecplcRNXEeiKtYjI8wVF7A" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ecqMgBNXEeiKtYjI8wVF7A" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ecplchNXEeiKtYjI8wVF7A" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Xo0Z0BNaEeiKtYjI8wVF7A" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xo0Z0RNaEeiKtYjI8wVF7A" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xo0Z0xNaEeiKtYjI8wVF7A" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xo0Z0hNaEeiKtYjI8wVF7A" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_nyMeWmRFEeikqoAaJ65uUg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_nyMeW2RFEeikqoAaJ65uUg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nyMeXWRFEeikqoAaJ65uUg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nyMeXGRFEeikqoAaJ65uUg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_oZmclGRFEeikqoAaJ65uUg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_oZmclWRFEeikqoAaJ65uUg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oZmcl2RFEeikqoAaJ65uUg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oZmclmRFEeikqoAaJ65uUg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_oaE9sGRFEeikqoAaJ65uUg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_oaE9sWRFEeikqoAaJ65uUg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oaE9s2RFEeikqoAaJ65uUg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oaE9smRFEeikqoAaJ65uUg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_6LW2imm1EeiLh_06MH5Rjg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_6LW2i2m1EeiLh_06MH5Rjg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6LW2jWm1EeiLh_06MH5Rjg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6LW2jGm1EeiLh_06MH5Rjg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_6p4leGm1EeiLh_06MH5Rjg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_6p4leWm1EeiLh_06MH5Rjg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6p4le2m1EeiLh_06MH5Rjg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6p4lemm1EeiLh_06MH5Rjg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_6qXGpGm1EeiLh_06MH5Rjg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_6qXGpWm1EeiLh_06MH5Rjg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6qXGp2m1EeiLh_06MH5Rjg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6qXGpmm1EeiLh_06MH5Rjg" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_dlxZ0IuSEeiu6boZkiJHCA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dlxZ0YuSEeiu6boZkiJHCA"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dlxZ04uSEeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dlxZ0ouSEeiu6boZkiJHCA" x="522" y="368"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_jtieAJwUEeidac_mNnugIw" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_jtjFEJwUEeidac_mNnugIw" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_jtjFEZwUEeidac_mNnugIw" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jtjFEpwUEeidac_mNnugIw" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_jtjFE5wUEeidac_mNnugIw" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_lbFk8JwUEeidac_mNnugIw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_YE76AZAdEei1rofSed2vtg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_lbFk8ZwUEeidac_mNnugIw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_lbGMAJwUEeidac_mNnugIw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiNotification.uml#_YE76ApAdEei1rofSed2vtg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_lbGMAZwUEeidac_mNnugIw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_jtjFFJwUEeidac_mNnugIw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_jtjFFZwUEeidac_mNnugIw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_jtjFFpwUEeidac_mNnugIw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jtjFF5wUEeidac_mNnugIw"/>
+      </children>
+      <element href="TapiNotification.uml#_YE76AJAdEei1rofSed2vtg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jtieAZwUEeidac_mNnugIw" x="1320" y="600" height="84"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M31xcKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M31xcaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M31xc6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_xEvjkN8AEeW-BtRsuJPbqg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M31xcqayEeqJcvXkREZ1XQ" x="820" y="240"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M4bnUKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M4bnUaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M4bnU6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_phsNMCzxEeaYO8M_h7XJ5A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M4bnUqayEeqJcvXkREZ1XQ" x="222" y="522"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M5UYIKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M5UYIaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M5UYI6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_oVDs4CzvEeaYO8M_h7XJ5A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M5UYIqayEeqJcvXkREZ1XQ" x="261" y="232"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M6KssKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M6KssaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M6Kss6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_rZ7rwCzyEeaYO8M_h7XJ5A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M6KssqayEeqJcvXkREZ1XQ" x="261" y="132"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M6SBcKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M6SBcaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M6SBc6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_Nsg9cE8cEea3rq3M7G3w3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M6SBcqayEeqJcvXkREZ1XQ" x="261" y="132"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M6rDAKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M6rDAaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M6rDA6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_7CEIsC1qEeair-8ZDvf8jw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M6rDAqayEeqJcvXkREZ1XQ" x="522" y="440"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M781YKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M781YaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M781Y6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M781YqayEeqJcvXkREZ1XQ" x="522" y="340"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M8C8AKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M8C8AaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M8DjEKayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_Hh5YECB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M8C8AqayEeqJcvXkREZ1XQ" x="522" y="340"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M8QXYKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M8QXYaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M8QXY6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_2HbQwC0UEeah7qIgVNfKeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M8QXYqayEeqJcvXkREZ1XQ" x="196" y="-200"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M87FwKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M87FwaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M87Fw6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_aQ9x8E8bEea3rq3M7G3w3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M87FwqayEeqJcvXkREZ1XQ" x="258" y="707"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M9kmAKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M9kmAaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M9kmA6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_mWGkkMh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M9kmAqayEeqJcvXkREZ1XQ" x="387" y="75"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M-AD0KayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M-AD0aayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M-AD06ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_qrNLMBM5Eee0L_IMWjydgQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M-AD0qayEeqJcvXkREZ1XQ" x="387" y="-25"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M-GKcKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M-GKcaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M-GKc6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_weSVgMh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M-GKcqayEeqJcvXkREZ1XQ" x="387" y="-25"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M-NfMKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M-NfMaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M-NfM6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_AGv4IMh6EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M-NfMqayEeqJcvXkREZ1XQ" x="387" y="-25"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M_IsQKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M_IsQaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M_IsQ6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M_IsQqayEeqJcvXkREZ1XQ" x="911" y="83"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_M_vwQKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M_vwQaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M_vwQ6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_K1S7ICCCEeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M_vwQqayEeqJcvXkREZ1XQ" x="260" y="960"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_NAhzYKayEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_NAhzYaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_NAhzY6ayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_MQft0CCCEeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NAhzYqayEeqJcvXkREZ1XQ" x="740" y="940"/>
+    </children>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_tIFpETBHEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_tIFpEjBHEeam35bpdXJzEw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_dbCJcIuSEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiNotification.uml#_xbgioC5xEea0_JngOlSKcA"/>
     </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_s-4WI4NiEeqLl4tIPv2RCg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s-4WJINiEeqLl4tIPv2RCg"/>
-    <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_s-4WJYNiEeqLl4tIPv2RCg"/>
-  </edges>
-</notation:Diagram>
+    <element href="TapiNotification.uml#_xbgioC5xEea0_JngOlSKcA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_4ANK0dwtEeaaobmDldrjOQ" type="StereotypeCommentLink" target="_4AKukNwtEeaaobmDldrjOQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_4ANK0twtEeaaobmDldrjOQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4ANx4twtEeaaobmDldrjOQ" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4ANK09wtEeaaobmDldrjOQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4ANx4NwtEeaaobmDldrjOQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4ANx4dwtEeaaobmDldrjOQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_oASyj_LfEeaAIfPpmDwI5Q" type="StereotypeCommentLink" target="_oASyi_LfEeaAIfPpmDwI5Q">
+      <styles xsi:type="notation:FontStyle" xmi:id="_oASykPLfEeaAIfPpmDwI5Q"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oASylPLfEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oASykfLfEeaAIfPpmDwI5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oASykvLfEeaAIfPpmDwI5Q"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oASyk_LfEeaAIfPpmDwI5Q"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_qsWasBM5Eee0L_IMWjydgQ" type="Abstraction_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_oDXmQBM5Eee0L_IMWjydgQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_qsWasxM5Eee0L_IMWjydgQ" type="Abstraction_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qsWatBM5Eee0L_IMWjydgQ" x="-2" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_qsWatRM5Eee0L_IMWjydgQ" type="Abstraction_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qsWathM5Eee0L_IMWjydgQ" x="-10" y="10"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_qsWasRM5Eee0L_IMWjydgQ"/>
+      <element href="TapiNotification.uml#_qrNLMBM5Eee0L_IMWjydgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qsWashM5Eee0L_IMWjydgQ" points="[36, 1, -216, -7]$[241, 4, -11, -4]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_quqH0BM5Eee0L_IMWjydgQ" id="(1.0,0.5135135135135135)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_quqH0RM5Eee0L_IMWjydgQ" id="(0.0,0.29)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_g4ChwFrnEeexvMtO2oNM9g" type="InterfaceRealization_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_whMV2zBHEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_g4Chw1rnEeexvMtO2oNM9g" type="InterfaceRealization_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_g4ChxFrnEeexvMtO2oNM9g" y="40"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_g4ChxVrnEeexvMtO2oNM9g" type="InterfaceRealization_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_g4ChxlrnEeexvMtO2oNM9g" y="60"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_g4ChwVrnEeexvMtO2oNM9g"/>
+      <element href="TapiNotification.uml#_g1uNkFrnEeexvMtO2oNM9g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_g4ChwlrnEeexvMtO2oNM9g" points="[0, 0, 85, 33]$[-85, 0, 0, 33]$[-85, -33, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_g7F1wFrnEeexvMtO2oNM9g" id="(0.0,0.24324324324324326)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_g7F1wVrnEeexvMtO2oNM9g" id="(0.09507246376811594,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_27UFwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_whMS9zBHEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_27UFw4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFxIuSEeiu6boZkiJHCA" x="9" y="-1"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_27UFxYuSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFxouSEeiu6boZkiJHCA" x="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_27UFx4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFyIuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_27UFyYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_27UFyouSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_27UFy4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_27Us0IuSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_27Us0YuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_27Us0ouSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_27UFwYuSEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_weSVgMh5EeaVlemTikmRHw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_27UFwouSEeiu6boZkiJHCA" points="[322, 149, -643984, -643984]$[269, 232, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_44SIwIuSEeiu6boZkiJHCA" id="(0.10344827586206896,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_5zVbwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_mX0b0Mh5EeaVlemTikmRHw" target="_whMUSDBHEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_5zWC0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC0YuSEeiu6boZkiJHCA" x="-106" y="-4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5zWC0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC04uSEeiu6boZkiJHCA" x="-122" y="-4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5zWC1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC1YuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5zWC1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC14uSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5zWC2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC2YuSEeiu6boZkiJHCA" x="-38" y="15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_5zWC2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_5zWC24uSEeiu6boZkiJHCA" x="36" y="-18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_5zVbwYuSEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_AGv4IMh6EeaVlemTikmRHw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_5zVbwouSEeiu6boZkiJHCA" points="[354, 149, -643984, -643984]$[427, 468, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6y-64IuSEeiu6boZkiJHCA" id="(0.8589341692789969,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XINK0KauEeqJcvXkREZ1XQ" id="(0.545,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_9GaWEIuSEeiu6boZkiJHCA" type="Association_Edge" source="_whMS9zBHEeam35bpdXJzEw" target="_whCixzBHEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_9GaWE4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWFIuSEeiu6boZkiJHCA" x="-4" y="1"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9GaWFYuSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWFouSEeiu6boZkiJHCA" x="-24" y="6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9GaWF4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWGIuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9GaWGYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9GaWGouSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9GaWG4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9Ga9IIuSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9Ga9IYuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9Ga9IouSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_9GaWEYuSEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_rZ7rwCzyEeaYO8M_h7XJ5A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_9GaWEouSEeiu6boZkiJHCA" points="[199, 406, -643984, -643984]$[180, 522, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-Cu0YIuSEeiu6boZkiJHCA" id="(0.1111111111111111,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-mUpoIuSEeiu6boZkiJHCA" id="(0.25,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__rY0QIuSEeiu6boZkiJHCA" type="Association_Edge" source="_whMS9zBHEeam35bpdXJzEw" target="_q_PtIE8bEea3rq3M7G3w3w">
+      <children xsi:type="notation:DecorationNode" xmi:id="__rZbUIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbUYuSEeiu6boZkiJHCA" x="-54" y="2"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__rZbUouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbU4uSEeiu6boZkiJHCA" x="-72" y="-9"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__rZbVIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbVYuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__rZbVouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbV4uSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__rZbWIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbWYuSEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__rZbWouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__rZbW4uSEeiu6boZkiJHCA" x="33" y="18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__rY0QYuSEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_Nsg9cE8cEea3rq3M7G3w3w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__rY0QouSEeiu6boZkiJHCA" points="[202, 406, -643984, -643984]$[161, 707, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_CZCGQIuTEeiu6boZkiJHCA" id="(0.4673202614379085,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_BcYQwIuTEeiu6boZkiJHCA" id="(0.7448979591836735,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EOmgwIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMS9zBHEeam35bpdXJzEw" target="_whMUSDBHEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_EOmgw4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EOmgxIuTEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EOmgxYuTEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EOmgxouTEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EOnH0IuTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH0YuTEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EOnH0ouTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH04uTEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EOnH1IuTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH1YuTEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EOnH1ouTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EOnH14uTEeiu6boZkiJHCA" x="-2" y="19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_EOmgwYuTEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_5oI2cC1sEeair-8ZDvf8jw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EOmgwouTEeiu6boZkiJHCA" points="[286, 406, -643984, -643984]$[337, 468, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FbcHUIuTEeiu6boZkiJHCA" id="(0.954248366013072,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_F3tMkIuTEeiu6boZkiJHCA" id="(0.095,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_Hmx9gIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMUSDBHEeam35bpdXJzEw" target="_whCiJjBHEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_HmykkIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6HbGwKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HmykkYuTEeiu6boZkiJHCA" x="1" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_HmykkouTEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6Mel4KauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Hmykk4uTEeiu6boZkiJHCA" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_HmyklIuTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6SMzYKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLoIuTEeiu6boZkiJHCA" x="17" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_HmzLoYuTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6YGAAKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLoouTEeiu6boZkiJHCA" x="-17" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_HmzLo4uTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6d2pwKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLpIuTEeiu6boZkiJHCA" x="9" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_HmzLpYuTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_6jmFYKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HmzLpouTEeiu6boZkiJHCA" x="-17" y="-18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Hmx9gYuTEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_kFsxgE8SEea3rq3M7G3w3w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hmx9gouTEeiu6boZkiJHCA" points="[504, 468, -643984, -643984]$[544, 328, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IuBSYIuTEeiu6boZkiJHCA" id="(0.845,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6pLwAKauEeqJcvXkREZ1XQ" id="(0.4117647058823529,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_KIyAMIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMUSDBHEeam35bpdXJzEw" target="_K1csICCCEeeWCKlkirNtnw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_KIyAM4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YXN7oKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyANIuTEeiu6boZkiJHCA" x="8"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KIyANYuTEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YeGmwKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyANouTEeiu6boZkiJHCA" x="-8" y="1"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KIyAN4uTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yjxw8KauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAOIuTEeiu6boZkiJHCA" x="15" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KIyAOYuTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ypn6QKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAOouTEeiu6boZkiJHCA" x="-16" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KIyAO4uTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvnNgKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAPIuTEeiu6boZkiJHCA" x="13" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KIyAPYuTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y1RJkKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KIyAPouTEeiu6boZkiJHCA" x="-14" y="-20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_KIyAMYuTEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_KIyAMouTEeiu6boZkiJHCA" points="[390, 768, -643984, -643984]$[353, 848, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LEbwIIuTEeiu6boZkiJHCA" id="(0.045,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LhOZ0IuTEeiu6boZkiJHCA" id="(0.5194805194805194,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_PeKJcIuTEeiu6boZkiJHCA" type="Association_Edge" source="_whMUSDBHEeam35bpdXJzEw" target="_MQpe0SCCEeeWCKlkirNtnw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_PeKJc4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ccg9EKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJdIuTEeiu6boZkiJHCA" x="5" y="5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_PeKJdYuTEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_chBpoKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJdouTEeiu6boZkiJHCA" x="-12" y="16"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_PeKJd4uTEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cl90AKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJeIuTEeiu6boZkiJHCA" x="14" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_PeKJeYuTEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cqpfsKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJeouTEeiu6boZkiJHCA" x="-16" y="17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_PeKJe4uTEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cvfjcKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJfIuTEeiu6boZkiJHCA" x="13" y="17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_PeKJfYuTEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_c0xsEKauEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_PeKJfouTEeiu6boZkiJHCA" x="-13" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_PeKJcYuTEeiu6boZkiJHCA"/>
+      <element href="TapiNotification.uml#_Hh5YECB_EeeWCKlkirNtnw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_PeKJcouTEeiu6boZkiJHCA" points="[544, 768, -643984, -643984]$[587, 847, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SldRkIuTEeiu6boZkiJHCA" id="(0.845,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Qbjl0IuTEeiu6boZkiJHCA" id="(0.29850746268656714,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M31xdKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_whCiJjBHEeam35bpdXJzEw" target="_M31xcKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M31xdaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M31xeaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_xEvjkN8AEeW-BtRsuJPbqg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M31xdqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M31xd6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M31xeKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M4cOYKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_whCixzBHEeam35bpdXJzEw" target="_M4bnUKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M4cOYaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M4cOZaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_phsNMCzxEeaYO8M_h7XJ5A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M4cOYqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M4cOY6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M4cOZKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M5U_MKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_whMS9zBHEeam35bpdXJzEw" target="_M5UYIKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M5U_MaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M5U_NaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_oVDs4CzvEeaYO8M_h7XJ5A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M5U_MqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M5U_M6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M5U_NKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M6KstKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9GaWEIuSEeiu6boZkiJHCA" target="_M6KssKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M6KstaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M6KsuaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_rZ7rwCzyEeaYO8M_h7XJ5A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M6KstqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M6Kst6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M6KsuKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M6SBdKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__rY0QIuSEeiu6boZkiJHCA" target="_M6SBcKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M6SBdaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M6SBeaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_Nsg9cE8cEea3rq3M7G3w3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M6SBdqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M6SBd6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M6SBeKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M6rDBKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_whMUSDBHEeam35bpdXJzEw" target="_M6rDAKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M6rDBaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M6rqEqayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_7CEIsC1qEeair-8ZDvf8jw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M6rDBqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M6rqEKayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M6rqEaayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M781ZKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_KIyAMIuTEeiu6boZkiJHCA" target="_M781YKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M781ZaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M79ccqayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_HA6K4CB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M781ZqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M79ccKayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M79ccaayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M8DjEaayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_PeKJcIuTEeiu6boZkiJHCA" target="_M8C8AKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M8DjEqayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M8DjFqayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_Hh5YECB_EeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M8DjE6ayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M8DjFKayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M8DjFaayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M8QXZKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_whMV2zBHEeam35bpdXJzEw" target="_M8QXYKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M8QXZaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M8QXaaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_2HbQwC0UEeah7qIgVNfKeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M8QXZqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M8QXZ6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M8QXaKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M87FxKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_q_PtIE8bEea3rq3M7G3w3w" target="_M87FwKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M87FxaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M87FyaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_aQ9x8E8bEea3rq3M7G3w3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M87FxqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M87Fx6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M87FyKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M9kmBKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_mX0b0Mh5EeaVlemTikmRHw" target="_M9kmAKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M9kmBaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M9kmCaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_mWGkkMh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M9kmBqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M9kmB6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M9kmCKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M-AD1KayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qsWasBM5Eee0L_IMWjydgQ" target="_M-AD0KayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M-AD1aayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M-AD2aayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_qrNLMBM5Eee0L_IMWjydgQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M-AD1qayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M-AD16ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M-AD2KayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M-GKdKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_27UFwIuSEeiu6boZkiJHCA" target="_M-GKcKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M-GKdaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M-GKeaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_weSVgMh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M-GKdqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M-GKd6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M-GKeKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M-NfNKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_5zVbwIuSEeiu6boZkiJHCA" target="_M-NfMKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M-NfNaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M-NfOaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_AGv4IMh6EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M-NfNqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M-NfN6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M-NfOKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M_IsRKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_oDXmQBM5Eee0L_IMWjydgQ" target="_M_IsQKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M_IsRaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M_IsSaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M_IsRqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M_IsR6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M_IsSKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_M_vwRKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_K1csICCCEeeWCKlkirNtnw" target="_M_vwQKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M_vwRaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M_vwSaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_K1S7ICCCEeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M_vwRqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M_vwR6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M_vwSKayEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_NAhzZKayEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MQpe0SCCEeeWCKlkirNtnw" target="_NAhzYKayEeqJcvXkREZ1XQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_NAhzZaayEeqJcvXkREZ1XQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_NAhzaaayEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiNotification.uml#_MQft0CCCEeeWCKlkirNtnw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_NAhzZqayEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NAhzZ6ayEeqJcvXkREZ1XQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NAhzaKayEeqJcvXkREZ1XQ"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_yey98KatEeqJcvXkREZ1XQ">
+    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_E4MvsIF2EeqLl4tIPv2RCg" path="/TAPI/UML/TapiClassDiagram.css"/>
+    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_E4MvsYF2EeqLl4tIPv2RCg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/UML/TapiNotification.uml b/UML/TapiNotification.uml
index f9faeadf..e224f463 100644
--- a/UML/TapiNotification.uml
+++ b/UML/TapiNotification.uml
@@ -131,7 +131,7 @@ Copyright: 2018 Open Networking Foundation (ONF).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_4zwy0C0iEeah7qIgVNfKeA" name="timePeriod" effect="read">
-            <type xmi:type="uml:Class" href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
+            <type xmi:type="uml:DataType" href="TapiCommon.uml#_Ay2V0F6UEeitO-Stqhyn1g"/>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_SumL4i0dEeah7qIgVNfKeA" name="notification" type="_7CEIsC1qEeair-8ZDvf8jw" direction="out" effect="read">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aVAjoC0dEeah7qIgVNfKeA"/>
@@ -376,6 +376,7 @@ This specifics of this is typically dependent on the implementation protocol &am
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HWLaAINjEeqLl4tIPv2RCg" name="HOLDER"/>
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I66jMINjEeqLl4tIPv2RCg" name="PHYSICAL_SPAN"/>
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_K44EsINjEeqLl4tIPv2RCg" name="ABSTRACT_STRAND"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lpyoIKayEeqJcvXkREZ1XQ" name="DEVICE"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Enumeration" xmi:id="_bgwjsCzeEeaYO8M_h7XJ5A" name="SourceIndicator" isLeaf="true">
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ggplICzeEeaYO8M_h7XJ5A" name="RESOURCE_OPERATION"/>
diff --git a/UML/TapiTopology.notation b/UML/TapiTopology.notation
index d64994b6..43793c53 100644
--- a/UML/TapiTopology.notation
+++ b/UML/TapiTopology.notation
@@ -1376,7 +1376,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WvSaaTBDEea4fKwSGMr6CA"/>
       </children>
       <element xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WvSalzBDEea4fKwSGMr6CA" x="588" y="177" height="364"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WvSalzBDEea4fKwSGMr6CA" x="720" y="300" height="364"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_WvSaojBDEea4fKwSGMr6CA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_WvSaozBDEea4fKwSGMr6CA" type="Class_NameLabel"/>
@@ -1769,213 +1769,213 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r05PgUwCEeewALXL7BvPYw" x="172" y="-6" height="88"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xPrp0KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xPrp0aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xPrp06GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MWjUMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MWjUMaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MWjUM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xPrp0qGnEeqPrpdMOOTlbQ" x="781" y="-29"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MWjUMqawEeqJcvXkREZ1XQ" x="781" y="-29"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xQErYKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xQErYaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQFScKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MW8VwKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MW8VwaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MW8Vw6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQErYqGnEeqPrpdMOOTlbQ" x="781" y="-129"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MW8VwqawEeqJcvXkREZ1XQ" x="781" y="-129"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xQPDcKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xQPDcaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQPDc6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MXIjAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MXIjAaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXIjA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW8dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQPDcqGnEeqPrpdMOOTlbQ" x="331" y="116"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXIjAqawEeqJcvXkREZ1XQ" x="331" y="116"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xQdF4KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xQdF4aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQdF46GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MXYaoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MXYaoaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXYao6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQdF4qGnEeqPrpdMOOTlbQ" x="788" y="177"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXYaoqawEeqJcvXkREZ1XQ" x="920" y="300"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRDi0KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRDi0aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRDi06GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYGzYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYGzYaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYGzY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRDi0qGnEeqPrpdMOOTlbQ" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYGzYqawEeqJcvXkREZ1XQ" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRKQgKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRKQgaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRKQg6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYLr4KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYLr4aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYLr46awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRKQgqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYLr4qawEeqJcvXkREZ1XQ" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRPwEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRPwEaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRPwE6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYSZkKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYSZkaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYSZk6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRPwEqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYSZkqawEeqJcvXkREZ1XQ" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRVPoKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRVPoaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRVPo6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYYgMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYYgMaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYYgM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRVPoqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYYgMqawEeqJcvXkREZ1XQ" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRaIIKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRaIIaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRaII6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYdYsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYdYsaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYdYs6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRaIIqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYdYsqawEeqJcvXkREZ1XQ" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRgOwKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRgOwaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRgOw6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYi4QKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYi4QaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYi4Q6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRgOwqGnEeqPrpdMOOTlbQ" x="788" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYi4QqawEeqJcvXkREZ1XQ" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRr086GnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xRr09KGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRscAKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MYuecKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MYuecaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYuec6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW_dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRr09aGnEeqPrpdMOOTlbQ" x="-128" y="-33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYuecqawEeqJcvXkREZ1XQ" x="-128" y="-33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xR3bIqGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xR3bI6GnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xR3bJaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MY9vAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MY9vAaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MY9vA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXB9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xR3bJKGnEeqPrpdMOOTlbQ" x="330" y="211"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MY9vAqawEeqJcvXkREZ1XQ" x="330" y="211"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xSCaQKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xSCaQaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSCaQ6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MZLKYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MZLKYaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZLKY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xSCaQqGnEeqPrpdMOOTlbQ" x="-133" y="106"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MZLKYqawEeqJcvXkREZ1XQ" x="-133" y="106"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xSxaEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xSxaEaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSyBIKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MZ9NgKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MZ9NgaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZ9Ng6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_CM28EN72EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xSxaEqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MZ9NgqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xS4u0KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xS4u0aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xS4u06GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MaD7MKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MaD7MaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaD7M6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_rJUvAN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xS4u0qGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaD7MqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTAqoKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTAqoaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTAqo6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MaKo4KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MaKo4aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaKo46awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#__ET2wN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTAqoqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaKo4qawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTHYUKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTHYUaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTHYU6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MaRWkKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MaRWkaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaRWk6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_WSiGUN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTHYUqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaRWkqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTOtEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTOtEaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTOtE6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MaYrUKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MaYrUaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaYrU6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_cQkyEN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTOtEqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaYrUqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTTlkKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTUMoKGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTUMoqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Maex8KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Maex8aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Maex86awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kZ4bgN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTUMoaGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Maex8qawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTaTQKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTaTQaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTaTQ6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MalfoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MalfoaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Malfo6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_gJx4QN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTaTQqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MalfoqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTfLwKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTfLwaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTfLw6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MasNUKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MasNUaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MasNU6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IZggAN8AEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTfLwqGnEeqPrpdMOOTlbQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MasNUqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xTo8wKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xTo8waGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTo8w6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Ma1-U6awEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ma1-VKawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ma1-VqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXXNyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTo8wqGnEeqPrpdMOOTlbQ" x="-66" y="515"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ma1-VaawEeqJcvXkREZ1XQ" x="-66" y="515"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xT1xEKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xT1xEaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xT1xE6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MbCLkKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MbCLkaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbCLk6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xT1xEqGnEeqPrpdMOOTlbQ" x="343" y="480"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbCLkqawEeqJcvXkREZ1XQ" x="343" y="480"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xUIE8KGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xUIE8aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUIE86GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MbXiwKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MbXiwaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbXiw6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXGdyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUIE8qGnEeqPrpdMOOTlbQ" x="333" y="318"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbXiwqawEeqJcvXkREZ1XQ" x="333" y="318"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xUeqQKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xUeqQaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUeqQ6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_MbznoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MbznoaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mbzno6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW99yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUeqQqGnEeqPrpdMOOTlbQ" x="-131" y="447"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbznoqawEeqJcvXkREZ1XQ" x="-131" y="447"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xUrekKGnEeqPrpdMOOTlbQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_xUrekaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUrek6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Mb_04KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Mb_04aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mb_046awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUrekqGnEeqPrpdMOOTlbQ" x="372" y="-6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mb_04qawEeqJcvXkREZ1XQ" x="372" y="-6"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_SFF5oTBDEea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_SFF5ojBDEea4fKwSGMr6CA"/>
@@ -2066,53 +2066,65 @@
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_G_CegIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSX4DBDEea4fKwSGMr6CA" target="_WvSZKTBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_G_Ceg4uHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFkIuHEeiu6boZkiJHCA" x="-11" y="-4"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dNzFgKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFkIuHEeiu6boZkiJHCA" x="-10" y="-4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_G_DFkYuHEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dSLPMKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFkouHEeiu6boZkiJHCA" x="6" y="-5"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_G_DFk4uHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFlIuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dV9jAKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFlIuHEeiu6boZkiJHCA" x="12" y="-19"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_G_DFlYuHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFlouHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_daW60KatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFlouHEeiu6boZkiJHCA" x="-13" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_G_DFl4uHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFmIuHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dfddQKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFmIuHEeiu6boZkiJHCA" x="13" y="17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_G_DFmYuHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFmouHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dkw0AKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G_DFmouHEeiu6boZkiJHCA" x="-13" y="-18"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_G_CegYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G_CegouHEeiu6boZkiJHCA" points="[721, 94, -643984, -643984]$[726, 177, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H-0ggIuHEeiu6boZkiJHCA" id="(0.22826086956521738,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H-0ggIuHEeiu6boZkiJHCA" id="(0.25,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IWFxAIuHEeiu6boZkiJHCA" id="(0.1718377088305489,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_JpiV4IuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvSX4DBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_JpiV44uHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_al4oEKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_JpiV5IuHEeiu6boZkiJHCA" x="-6" y="-5"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_JpiV5YuHEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aqfbQKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi88IuHEeiu6boZkiJHCA" x="6" y="-7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Jpi88YuHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi88ouHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_au-5sKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi88ouHEeiu6boZkiJHCA" x="12" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Jpi884uHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi89IuHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_azci8KatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi89IuHEeiu6boZkiJHCA" x="-12" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Jpi89YuHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi89ouHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a36zQKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi89ouHEeiu6boZkiJHCA" x="12" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Jpi894uHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi8-IuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a8DFUKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jpi8-IuHEeiu6boZkiJHCA" x="-12" y="-20"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_JpiV4YuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JpiV4ouHEeiu6boZkiJHCA" points="[726, 177, -643984, -643984]$[721, 94, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KsY6AIuHEeiu6boZkiJHCA" id="(0.7923627684964201,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L1geMIuHEeiu6boZkiJHCA" id="(0.8442028985507246,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L1geMIuHEeiu6boZkiJHCA" id="(0.8560606060606061,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_OkjeYIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvbikTBDEea4fKwSGMr6CA" target="_r05PgEwCEeewALXL7BvPYw">
       <children xmi:type="notation:DecorationNode" xmi:id="_OkjeY4uHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -2238,388 +2250,418 @@
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_jltkAIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_r05PgEwCEeewALXL7BvPYw">
       <children xmi:type="notation:DecorationNode" xmi:id="_jluLEIuHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLEYuHEeiu6boZkiJHCA" x="-7" y="-2"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bAVvcKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLEYuHEeiu6boZkiJHCA" x="-6" y="-1"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_jluLEouHEeiu6boZkiJHCA" visible="false" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLE4uHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bEwVYKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLE4uHEeiu6boZkiJHCA" x="-1" y="17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_jluLFIuHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLFYuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bL7UYKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLFYuHEeiu6boZkiJHCA" x="33" y="-18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_jluLFouHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLF4uHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bRuaYKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLF4uHEeiu6boZkiJHCA" x="-33" y="17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_jluLGIuHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLGYuHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bW3ZEKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLGYuHEeiu6boZkiJHCA" x="32" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_jluLGouHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLG4uHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bbs1wKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jluLG4uHEeiu6boZkiJHCA" x="-32" y="-19"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_jltkAYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jltkAouHEeiu6boZkiJHCA" points="[588, 215, -643984, -643984]$[358, 82, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__gVsAKGnEeqPrpdMOOTlbQ" id="(0.1718377088305489,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lq-AUIuHEeiu6boZkiJHCA" id="(1.0,0.5113636363636364)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lq-AUIuHEeiu6boZkiJHCA" id="(1.0,0.5227272727272727)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_tDE2UIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvSYxjBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_tDE2U4uHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2VIuHEeiu6boZkiJHCA" x="-3"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bgEYYKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2VIuHEeiu6boZkiJHCA" x="-2"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_tDE2VYuHEeiu6boZkiJHCA" visible="false" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2VouHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bj7ksKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2VouHEeiu6boZkiJHCA" x="-1" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_tDE2V4uHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2WIuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_boHhIKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2WIuHEeiu6boZkiJHCA" x="25" y="-18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_tDE2WYuHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2WouHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bsXH8KatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2WouHEeiu6boZkiJHCA" x="-25" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_tDE2W4uHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2XIuHEeiu6boZkiJHCA" x="-6" y="13"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bwrnQKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2XIuHEeiu6boZkiJHCA" x="19" y="12"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_tDE2XYuHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2XouHEeiu6boZkiJHCA" x="8" y="-14"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b1SacKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDE2XouHEeiu6boZkiJHCA" x="-17" y="-12"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_tDE2UYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tDE2UouHEeiu6boZkiJHCA" points="[588, 252, -643984, -643984]$[380, 184, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ktOoKGnEeqPrpdMOOTlbQ" id="(0.0,0.11813186813186813)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uPaGkIuHEeiu6boZkiJHCA" id="(1.0,0.5588235294117647)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ktOoKGnEeqPrpdMOOTlbQ" id="(0.0,0.10989010989010989)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uPaGkIuHEeiu6boZkiJHCA" id="(1.0,0.6470588235294118)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_wlHZsIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_Wvbh0DBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_wlIAwIuHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b54mkKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIAwYuHEeiu6boZkiJHCA" x="1" y="-6"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_wlIAwouHEeiu6boZkiJHCA" visible="false" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b-964KatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIAw4uHEeiu6boZkiJHCA" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_wlIAxIuHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIAxYuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cEde4KatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIAxYuHEeiu6boZkiJHCA" x="24" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_wlIAxouHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIAx4uHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cJIjgKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIAx4uHEeiu6boZkiJHCA" x="-24" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_wlIn0IuHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIn0YuHEeiu6boZkiJHCA" x="-10" y="13"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cNh7UKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIn0YuHEeiu6boZkiJHCA" x="14" y="13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_wlIn0ouHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIn04uHEeiu6boZkiJHCA" x="10" y="13"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cSAysKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wlIn04uHEeiu6boZkiJHCA" x="-14" y="13"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_wlHZsYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlHZsouHEeiu6boZkiJHCA" points="[588, 280, -643984, -643984]$[428, 259, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xxzPQIuHEeiu6boZkiJHCA" id="(0.0,0.22802197802197802)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykkwAIuHEeiu6boZkiJHCA" id="(1.0,0.9310344827586207)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xxzPQIuHEeiu6boZkiJHCA" id="(0.0,0.21978021978021978)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykkwAIuHEeiu6boZkiJHCA" id="(1.0,0.8448275862068966)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2A9XUIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvlTcTBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_2A9-YIuHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cWGBcKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-YYuHEeiu6boZkiJHCA" y="-10"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2A9-YouHEeiu6boZkiJHCA" visible="false" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ca0wcKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-Y4uHEeiu6boZkiJHCA" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2A9-ZIuHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-ZYuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cfOvUKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-ZYuHEeiu6boZkiJHCA" x="6" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2A9-ZouHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-Z4uHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cjinkKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-Z4uHEeiu6boZkiJHCA" x="-6" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2A9-aIuHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-aYuHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnqSkKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-aYuHEeiu6boZkiJHCA" x="6" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2A9-aouHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-a4uHEeiu6boZkiJHCA" x="13" y="15"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_csg9YKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2A9-a4uHEeiu6boZkiJHCA" x="7" y="15"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_2A9XUYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2A9XUouHEeiu6boZkiJHCA" points="[588, 327, -643984, -643984]$[421, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Bve4IuHEeiu6boZkiJHCA" id="(0.0,0.5027472527472527)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Bve4IuHEeiu6boZkiJHCA" id="(0.0,0.4945054945054945)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_395lIIuHEeiu6boZkiJHCA" id="(1.0,0.29577464788732394)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_5Y3HQIuHEeiu6boZkiJHCA" type="Association_Edge" source="_WvSZKTBDEea4fKwSGMr6CA" target="_WvlS0DBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_5Y3uUIuHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y3uUYuHEeiu6boZkiJHCA" x="-10" y="-11"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cxXoMKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y3uUYuHEeiu6boZkiJHCA" x="-9" y="-10"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_5Y3uUouHEeiu6boZkiJHCA" visible="false" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y3uU4uHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c2c8gKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y3uU4uHEeiu6boZkiJHCA" x="1" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_5Y3uVIuHEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y3uVYuHEeiu6boZkiJHCA" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c7RyIKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y3uVYuHEeiu6boZkiJHCA" x="18" y="-19"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_5Y4VYIuHEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y4VYYuHEeiu6boZkiJHCA" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c_7ooKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y4VYYuHEeiu6boZkiJHCA" x="-17" y="18"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_5Y4VYouHEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y4VY4uHEeiu6boZkiJHCA" x="-23" y="15"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dFPmcKatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y4VY4uHEeiu6boZkiJHCA" x="-5" y="13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_5Y4VZIuHEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y4VZYuHEeiu6boZkiJHCA" x="21" y="-13"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dJcJ8KatEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Y4VZYuHEeiu6boZkiJHCA" x="3" y="-12"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_5Y3HQYuHEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5Y3HQouHEeiu6boZkiJHCA" points="[588, 370, -643984, -643984]$[366, 480, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6U9jIIuHEeiu6boZkiJHCA" id="(0.0,0.6675824175824175)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7VAD0IuHEeiu6boZkiJHCA" id="(1.0,0.3626373626373626)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6U9jIIuHEeiu6boZkiJHCA" id="(0.0,0.6593406593406593)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7VAD0IuHEeiu6boZkiJHCA" id="(1.0,0.43956043956043955)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xPrp1KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSX4DBDEea4fKwSGMr6CA" target="_xPrp0KGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xPrp1aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xPsQ4aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MWjUNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSX4DBDEea4fKwSGMr6CA" target="_MWjUMKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MWjUNaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MWjUOaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xPrp1qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xPrp16GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xPsQ4KGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MWjUNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MWjUN6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MWjUOKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xQFScaGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_G_CegIuHEeiu6boZkiJHCA" target="_xQErYKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xQFScqGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQFSdqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MW8VxKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_G_CegIuHEeiu6boZkiJHCA" target="_MW8VwKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MW8VxaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MW8VyaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xQFSc6GnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQFSdKGnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQFSdaGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MW8VxqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MW8Vx6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MW8VyKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xQPDdKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSYxjBDEea4fKwSGMr6CA" target="_xQPDcKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xQPDdaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQPDeaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MXIjBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSYxjBDEea4fKwSGMr6CA" target="_MXIjAKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MXIjBaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXIjCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW8dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xQPDdqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQPDd6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQPDeKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MXIjBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXIjB6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXIjCKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xQdF5KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSZKTBDEea4fKwSGMr6CA" target="_xQdF4KGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xQdF5aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xQdF6aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MXYapKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSZKTBDEea4fKwSGMr6CA" target="_MXYaoKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MXYapaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXZBsqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xQdF5qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQdF56GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xQdF6KGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MXYapqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXZBsKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXZBsaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRDi1KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_JpiV4IuHEeiu6boZkiJHCA" target="_xRDi0KGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRDi1aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRDi2aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYGzZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_JpiV4IuHEeiu6boZkiJHCA" target="_MYGzYKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYGzZaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYGzaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRDi1qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRDi16GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRDi2KGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYGzZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYGzZ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYGzaKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRKQhKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_jltkAIuHEeiu6boZkiJHCA" target="_xRKQgKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRKQhaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRKQiaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYMS8KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_jltkAIuHEeiu6boZkiJHCA" target="_MYLr4KawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYMS8aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYMS9aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRKQhqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRKQh6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRKQiKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYMS8qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYMS86awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYMS9KawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRPwFKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_tDE2UIuHEeiu6boZkiJHCA" target="_xRPwEKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRPwFaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRQXIaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYSZlKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tDE2UIuHEeiu6boZkiJHCA" target="_MYSZkKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYSZlaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYSZmaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRPwFqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRPwF6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRQXIKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYSZlqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYSZl6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYSZmKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRVPpKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_wlHZsIuHEeiu6boZkiJHCA" target="_xRVPoKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRVPpaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRVPqaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYYgNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_wlHZsIuHEeiu6boZkiJHCA" target="_MYYgMKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYYgNaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYYgOaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRVPpqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRVPp6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRVPqKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYYgNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYYgN6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYYgOKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRaIJKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_2A9XUIuHEeiu6boZkiJHCA" target="_xRaIIKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRaIJaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRaIKaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYd_wKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_2A9XUIuHEeiu6boZkiJHCA" target="_MYdYsKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYd_waawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYd_xaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRaIJqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRaIJ6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRaIKKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYd_wqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYd_w6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYd_xKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRgOxKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_5Y3HQIuHEeiu6boZkiJHCA" target="_xRgOwKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRgOxaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRgOyaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYi4RKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_5Y3HQIuHEeiu6boZkiJHCA" target="_MYi4QKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYi4RaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYjfUqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRgOxqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRgOx6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRgOyKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYi4RqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYjfUKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYjfUaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xRscAaGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvSaojBDEea4fKwSGMr6CA" target="_xRr086GnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xRscAqGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xRscBqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MYuedKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSaojBDEea4fKwSGMr6CA" target="_MYuecKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MYuedaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYueeaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW_dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xRscA6GnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRscBKGnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xRscBaGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYuedqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYued6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYueeKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xR3bJqGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_Wvbh0DBDEea4fKwSGMr6CA" target="_xR3bIqGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xR3bJ6GnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xR3bK6GnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MY9vBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Wvbh0DBDEea4fKwSGMr6CA" target="_MY9vAKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MY9vBaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MY9vCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXB9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xR3bKKGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xR3bKaGnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xR3bKqGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MY9vBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MY9vB6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MY9vCKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xSCaRKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvbikTBDEea4fKwSGMr6CA" target="_xSCaQKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xSCaRaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSCaSaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MZLKZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvbikTBDEea4fKwSGMr6CA" target="_MZLKYKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MZLKZaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZLKaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xSCaRqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSCaR6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSCaSKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MZLKZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZLKZ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZLKaKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xSyBIaGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_7c87YIuGEeiu6boZkiJHCA" target="_xSxaEKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xSyBIqGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSyBJqGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MZ9NhKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7c87YIuGEeiu6boZkiJHCA" target="_MZ9NgKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MZ9NhaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZ9NiaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_CM28EN72EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xSyBI6GnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSyBJKGnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSyBJaGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MZ9NhqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZ9Nh6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZ9NiKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xS4u1KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="__ZY7wIuGEeiu6boZkiJHCA" target="_xS4u0KGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xS4u1aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xS4u2aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MaD7NKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__ZY7wIuGEeiu6boZkiJHCA" target="_MaD7MKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MaD7NaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaD7OaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_rJUvAN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xS4u1qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xS4u16GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xS4u2KGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaD7NqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaD7N6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaD7OKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTAqpKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_CtslIIuHEeiu6boZkiJHCA" target="_xTAqoKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTAqpaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTAqqaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MaKo5KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_CtslIIuHEeiu6boZkiJHCA" target="_MaKo4KawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MaKo5aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaKo6aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#__ET2wN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTAqpqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTAqp6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTAqqKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaKo5qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaKo56awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaKo6KawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTHYVKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_OkjeYIuHEeiu6boZkiJHCA" target="_xTHYUKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTHYVaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTH_YKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MaRWlKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_OkjeYIuHEeiu6boZkiJHCA" target="_MaRWkKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MaRWlaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaRWmaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_WSiGUN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTHYVqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTHYV6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTHYWKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaRWlqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaRWl6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaRWmKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTOtFKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_RNDKoIuHEeiu6boZkiJHCA" target="_xTOtEKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTOtFaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTOtGaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MaYrVKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_RNDKoIuHEeiu6boZkiJHCA" target="_MaYrUKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MaYrVaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaYrWaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_cQkyEN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTOtFqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTOtF6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTOtGKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaYrVqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaYrV6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaYrWKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTUMo6GnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_ZCnYsIuHEeiu6boZkiJHCA" target="_xTTlkKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTUMpKGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTUMqKGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Maex9KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ZCnYsIuHEeiu6boZkiJHCA" target="_Maex8KawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Maex9aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Maex-aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kZ4bgN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTUMpaGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTUMpqGnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTUMp6GnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Maex9qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Maex96awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Maex-KawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTaTRKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_b4wfYIuHEeiu6boZkiJHCA" target="_xTaTQKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTaTRaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTaTSaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MalfpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_b4wfYIuHEeiu6boZkiJHCA" target="_MalfoKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MalfpaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MalfqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_gJx4QN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTaTRqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTaTR6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTaTSKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MalfpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Malfp6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MalfqKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTfLxKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_e2FMIIuHEeiu6boZkiJHCA" target="_xTfLwKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTfLxaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTfLyaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MasNVKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_e2FMIIuHEeiu6boZkiJHCA" target="_MasNUKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MasNVaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MasNWaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IZggAN8AEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTfLxqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTfLx6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTfLyKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MasNVqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MasNV6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MasNWKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xTo8xKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvblRTBDEea4fKwSGMr6CA" target="_xTo8wKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTo8xaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTo8yaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Ma1-V6awEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvblRTBDEea4fKwSGMr6CA" target="_Ma1-U6awEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ma1-WKawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ma2lYqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXXNyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTo8xqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTo8x6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xTo8yKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ma1-WaawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ma2lYKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ma2lYaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xT1xFKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvlS0DBDEea4fKwSGMr6CA" target="_xT1xEKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xT1xFaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xT1xGaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MbCLlKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvlS0DBDEea4fKwSGMr6CA" target="_MbCLkKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MbCLlaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbCLmaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xT1xFqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xT1xF6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xT1xGKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbCLlqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbCLl6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbCLmKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xUIE9KGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvlTcTBDEea4fKwSGMr6CA" target="_xUIE8KGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xUIE9aGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUIE-aGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MbXixKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvlTcTBDEea4fKwSGMr6CA" target="_MbXiwKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MbXixaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbXiyaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXGdyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUIE9qGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUIE96GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUIE-KGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbXixqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbXix6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbXiyKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xUeqRKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_WvlUkzBDEea4fKwSGMr6CA" target="_xUeqQKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xUeqRaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUeqSaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_MbznpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvlUkzBDEea4fKwSGMr6CA" target="_MbznoKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MbznpaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbznqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW99yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUeqRqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUeqR6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUeqSKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbznpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mbznp6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbznqKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xUrelKGnEeqPrpdMOOTlbQ" type="StereotypeCommentLink" source="_r05PgEwCEeewALXL7BvPYw" target="_xUrekKGnEeqPrpdMOOTlbQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_xUrelaGnEeqPrpdMOOTlbQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xUremaGnEeqPrpdMOOTlbQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Mb_05KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_r05PgEwCEeewALXL7BvPYw" target="_Mb_04KawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Mb_05aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mb_06aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUrelqGnEeqPrpdMOOTlbQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUrel6GnEeqPrpdMOOTlbQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xUremKGnEeqPrpdMOOTlbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Mb_05qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mb_056awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mb_06KawEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_d6faUDBDEea4fKwSGMr6CA" type="PapyrusUMLClassDiagram" name="TopologyServiceSkeleton" measurementUnit="Pixel">
diff --git a/UML/TapiVirtualNetwork.notation b/UML/TapiVirtualNetwork.notation
index 83e27be1..fff8bfa1 100644
--- a/UML/TapiVirtualNetwork.notation
+++ b/UML/TapiVirtualNetwork.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_g5NmgDBJEeaSroGqGbZ6jg" type="PapyrusUMLClassDiagram" name="VirtualNetworkService" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_lfOIUDBJEeaSroGqGbZ6jg" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_lfOIUTBJEeaSroGqGbZ6jg" type="Class_NameLabel"/>
@@ -157,26 +157,10 @@
       <element xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfX60jBJEeaSroGqGbZ6jg" x="665" y="259" width="158" height="53"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_lg3HGjBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_lg3HGzBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lg3HHTBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Usage" href="TapiVirtualNetwork.uml#_N1FvkPVUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg3HHDBJEeaSroGqGbZ6jg" x="184" y="5"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_lg3HMDBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_lg3HMTBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lg3HMzBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Usage" href="TapiVirtualNetwork.uml#_c2U6IPVUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg3HMjBJEeaSroGqGbZ6jg" x="184" y="5"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_lhKCIDBJEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_lhKCITBJEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lhKCIzBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiConnectivity.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lhKCIjBJEeaSroGqGbZ6jg" x="505" y="284"/>
@@ -189,62 +173,14 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lhc8_DBJEeaSroGqGbZ6jg" x="874" y="275"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_5Q9NiDBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5Q9NiTBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5Q9NizBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Q9NijBJEeaSroGqGbZ6jg" x="844" y="110"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_5RG-gTBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5RG-gjBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RG-hDBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5RG-gzBJEeaSroGqGbZ6jg" x="493" y="252"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_5RG-2TBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5RG-2jBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RG-3DBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5RG-2zBJEeaSroGqGbZ6jg" x="504" y="107"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_5RQvhDBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5RQvhTBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RQvhzBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiVirtualNetwork.uml#_02QCUPUlEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5RQvhjBJEeaSroGqGbZ6jg" x="184" y="105"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_5RQv0DBJEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_5RQv0TBJEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RQv0zBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiConnectivity.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5RQv0jBJEeaSroGqGbZ6jg" x="505" y="384"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_5RZ5eDBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5RZ5eTBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RZ5ezBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5RZ5ejBJEeaSroGqGbZ6jg" x="874" y="375"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_5RZ50DBJEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5RZ50TBJEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RZ50zBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5RZ50jBJEeaSroGqGbZ6jg" x="865" y="261"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_M5-vQD3vEea-1_BGg-qcjQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_M5-vQj3vEea-1_BGg-qcjQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_M5-vQz3vEea-1_BGg-qcjQ" type="Class_FloatingNameLabel">
@@ -271,14 +207,6 @@
       <element xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M5-vQT3vEea-1_BGg-qcjQ" x="-23" y="208" width="174" height="74"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_M6RqMz3vEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_M6RqND3vEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M6RqNj3vEea-1_BGg-qcjQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M6RqNT3vEea-1_BGg-qcjQ" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_7ro1kEJwEea-2Meh9kw1kA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_7ro1kkJwEea-2Meh9kw1kA" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_7ro1k0JwEea-2Meh9kw1kA" type="Class_FloatingNameLabel">
@@ -305,18 +233,10 @@
       <element xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ro1kUJwEea-2Meh9kw1kA" x="875" y="151" width="198" height="62"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_7rymq0JwEea-2Meh9kw1kA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7rymrEJwEea-2Meh9kw1kA" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7rymrkJwEea-2Meh9kw1kA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7rymrUJwEea-2Meh9kw1kA" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_8vVHS0JwEea-2Meh9kw1kA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_8vVHTEJwEea-2Meh9kw1kA" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8vVHTkJwEea-2Meh9kw1kA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_7vdU8Gh_EeWZEqTYAF8eqA"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_7vdU8Gh_EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vVHTUJwEea-2Meh9kw1kA" x="200"/>
@@ -324,7 +244,7 @@
     <children xmi:type="notation:Shape" xmi:id="_CuEWhkJxEea-2Meh9kw1kA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_CuEWh0JxEea-2Meh9kw1kA" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CuEWiUJxEea-2Meh9kw1kA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_LGsOIGkDEeWZEqTYAF8eqA"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_LGsOIGkDEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CuEWiEJxEea-2Meh9kw1kA" x="1042" y="208"/>
@@ -332,7 +252,7 @@
     <children xmi:type="notation:Shape" xmi:id="_HThes0JxEea-2Meh9kw1kA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_HThetEJxEea-2Meh9kw1kA" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HThetkJxEea-2Meh9kw1kA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_8VTUQD-_EeWNAdBR30aJhw"/>
+        <eObjectValue xmi:type="ecore:EObject" href="TapiTopology.uml#_8VTUQD-_EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HThetUJxEea-2Meh9kw1kA" x="809" y="157"/>
@@ -363,14 +283,6 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N-VAYU0SEeaqn4OIuRCwEg" x="296" y="387" width="155" height="55"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_N-exe00SEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_N-exfE0SEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N-exfk0SEeaqn4OIuRCwEg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N-exfU0SEeaqn4OIuRCwEg" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_N_0OI00SEeaqn4OIuRCwEg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_N_0OJE0SEeaqn4OIuRCwEg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N_0OJk0SEeaqn4OIuRCwEg" name="BASE_ELEMENT">
@@ -433,14 +345,6 @@
       <element xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FMDag8h5EeaVlemTikmRHw" x="-11" y="-40" height="81"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_FMJhO8h5EeaVlemTikmRHw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_FMJhPMh5EeaVlemTikmRHw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FMJhPsh5EeaVlemTikmRHw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FMJhPch5EeaVlemTikmRHw" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_kN8sgBM8Eee0L_IMWjydgQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_kN8sghM8Eee0L_IMWjydgQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_kN8sgxM8Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
@@ -467,77 +371,157 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kN8sgRM8Eee0L_IMWjydgQ" x="548" y="-41" width="202" height="73"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_kOCzMxM8Eee0L_IMWjydgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_kOCzNBM8Eee0L_IMWjydgQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kOCzNhM8Eee0L_IMWjydgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_jHi8kKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jHi8kaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHjjoKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kOCzNRM8Eee0L_IMWjydgQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHi8kqasEeqJcvXkREZ1XQ" x="875" y="79"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ornxsxM8Eee0L_IMWjydgQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ornxtBM8Eee0L_IMWjydgQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ornxthM8Eee0L_IMWjydgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiVirtualNetwork.uml#_m5z10BM8Eee0L_IMWjydgQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_jHq4YKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jHq4YaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHq4Y6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ornxtRM8Eee0L_IMWjydgQ" x="189" y="-140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHq4YqasEeqJcvXkREZ1XQ" x="875" y="-21"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ktsCQ4uTEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ktsCRIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ktsCRouTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_S3gd4Mh5EeaVlemTikmRHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_jHzbQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jHzbQaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jH0CUKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHzbQqasEeqJcvXkREZ1XQ" x="875" y="-21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jICEwKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jICEwaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jICEw6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jICEwqasEeqJcvXkREZ1XQ" x="493" y="252"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jIRVU6asEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jIRVVKasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIRVVqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktsCRYuTEeiu6boZkiJHCA" x="189" y="-140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIRVVaasEeqJcvXkREZ1XQ" x="501" y="75"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_oC8t44uTEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_oC8t5IuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oC9U8IuTEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_jIXb8KasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jIXb8aasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIXb86asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oC8t5YuTEeiu6boZkiJHCA" x="501" y="-25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIXb8qasEeqJcvXkREZ1XQ" x="501" y="-25"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qEK-w4uTEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qEK-xIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qEK-xouTEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_jIdikKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jIdikaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIdik6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qEK-xYuTEeiu6boZkiJHCA" x="501" y="-25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIdikqasEeqJcvXkREZ1XQ" x="501" y="-25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jIkQQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jIkQQaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIkQQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_oWBRAPTaEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIkQQqasEeqJcvXkREZ1XQ" x="501" y="-25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jIuBQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jIuBQaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIuBQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiVirtualNetwork.uml#_02QCUPUlEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIuBQqasEeqJcvXkREZ1XQ" x="174" y="77"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jI944KasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jI944aasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jI9446asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jI944qasEeqJcvXkREZ1XQ" x="874" y="383"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jJO-oKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jJO-oaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJO-o6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJO-oqasEeqJcvXkREZ1XQ" x="865" y="259"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_96gQA4uTEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_96gQBIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_96g3EIuTEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_jJXhgKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jJXhgaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJXhg6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_96gQBYuTEeiu6boZkiJHCA" x="865" y="159"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJXhgqasEeqJcvXkREZ1XQ" x="865" y="159"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_AH7J04uUEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_AH7J1IuUEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AH7w4IuUEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_jJjHsKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jJjHsaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJjHs6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AH7J1YuUEeiu6boZkiJHCA" x="875" y="-21"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJjHsqasEeqJcvXkREZ1XQ" x="177" y="208"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_D7aCg4uUEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D7aChIuUEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D7aChouUEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_jJ5F86asEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jJ5F9KasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJ5tAKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D7aChYuUEeiu6boZkiJHCA" x="875" y="-21"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJ5F9aasEeqJcvXkREZ1XQ" x="1075" y="151"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_GvG5M4uUEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_GvG5NIuUEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GvG5NouUEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_oWBRAPTaEeWQB8HQFBfkJQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_jKEFEKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jKEFEaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKEFE6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvG5NYuUEeiu6boZkiJHCA" x="501" y="-25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKEFEqasEeqJcvXkREZ1XQ" x="496" y="387"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jKPrQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jKPrQaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKPrQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKPrQqasEeqJcvXkREZ1XQ" x="189" y="-40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jKY1MKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jKY1MaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKY1M6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiVirtualNetwork.uml#_m5z10BM8Eee0L_IMWjydgQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKY1MqasEeqJcvXkREZ1XQ" x="189" y="-140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jKdtsKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jKdtsaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKdts6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_S3gd4Mh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKdtsqasEeqJcvXkREZ1XQ" x="189" y="-140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jKqiAKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jKqiAaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKqiA6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKqiAqasEeqJcvXkREZ1XQ" x="748" y="-41"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_g5NmgTBJEeaSroGqGbZ6jg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_g5NmgjBJEeaSroGqGbZ6jg"/>
@@ -571,136 +555,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lfX6_TBJEeaSroGqGbZ6jg" id="(1.0,0.8494623655913979)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lfX6_jBJEeaSroGqGbZ6jg" id="(0.0,0.9397590361445783)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_lg3HHjBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfX60zBJEeaSroGqGbZ6jg" target="_lg3HGjBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_lg3HHzBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lg3HIzBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Usage" href="TapiVirtualNetwork.uml#_N1FvkPVUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lg3HIDBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lg3HITBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lg3HIjBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_lg3HNDBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfX68zBJEeaSroGqGbZ6jg" target="_lg3HMDBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_lg3HNTBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lg3HOTBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Usage" href="TapiVirtualNetwork.uml#_c2U6IPVUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lg3HNjBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lg3HNzBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lg3HODBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5Q9NjDBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfOIUDBJEeaSroGqGbZ6jg" target="_5Q9NiDBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_5Q9NjTBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5Q9NkTBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5Q9NjjBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5Q9NjzBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5Q9NkDBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5RG-hTBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfOIkTBJEeaSroGqGbZ6jg" target="_5RG-gTBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_5RG-hjBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RG-ijBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5RG-hzBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RG-iDBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RG-iTBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5RG-3TBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_5RG-2TBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_5RG-3jBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RG-4jBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5RG-3zBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RG-4DBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RG-4TBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5RQviDBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfX5hTBJEeaSroGqGbZ6jg" target="_5RQvhDBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_5RQviTBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RQvjTBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiVirtualNetwork.uml#_02QCUPUlEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5RQvijBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RQvizBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RQvjDBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5RZ5fDBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfX6KTBJEeaSroGqGbZ6jg" target="_5RZ5eDBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_5RZ5fTBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RZ5gTBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5RZ5fjBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RZ5fzBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RZ5gDBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5RZ51DBJEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_lfX6kjBJEeaSroGqGbZ6jg" target="_5RZ50DBJEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_5RZ51TBJEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5RZ52TBJEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5RZ51jBJEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RZ51zBJEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RZ52DBJEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_M6RqNz3vEea-1_BGg-qcjQ" type="StereotypeCommentLink" source="_M5-vQD3vEea-1_BGg-qcjQ" target="_M6RqMz3vEea-1_BGg-qcjQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_M6RqOD3vEea-1_BGg-qcjQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M6RqPD3vEea-1_BGg-qcjQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M6RqOT3vEea-1_BGg-qcjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M6RqOj3vEea-1_BGg-qcjQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M6RqOz3vEea-1_BGg-qcjQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_7rymr0JwEea-2Meh9kw1kA" type="StereotypeCommentLink" source="_7ro1kEJwEea-2Meh9kw1kA" target="_7rymq0JwEea-2Meh9kw1kA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_7rymsEJwEea-2Meh9kw1kA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7rymtEJwEea-2Meh9kw1kA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7rymsUJwEea-2Meh9kw1kA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7rymskJwEea-2Meh9kw1kA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ryms0JwEea-2Meh9kw1kA"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_N-exf00SEeaqn4OIuRCwEg" type="StereotypeCommentLink" source="_N-VAYE0SEeaqn4OIuRCwEg" target="_N-exe00SEeaqn4OIuRCwEg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_N-exgE0SEeaqn4OIuRCwEg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N-exhE0SEeaqn4OIuRCwEg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N-exgU0SEeaqn4OIuRCwEg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N-exgk0SEeaqn4OIuRCwEg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N-exg00SEeaqn4OIuRCwEg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_FMJhP8h5EeaVlemTikmRHw" type="StereotypeCommentLink" source="_FMDagsh5EeaVlemTikmRHw" target="_FMJhO8h5EeaVlemTikmRHw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_FMJhQMh5EeaVlemTikmRHw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FMJhRMh5EeaVlemTikmRHw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FMJhQch5EeaVlemTikmRHw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FMJhQsh5EeaVlemTikmRHw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FMJhQ8h5EeaVlemTikmRHw"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_kOCzNxM8Eee0L_IMWjydgQ" type="StereotypeCommentLink" source="_kN8sgBM8Eee0L_IMWjydgQ" target="_kOCzMxM8Eee0L_IMWjydgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_kOCzOBM8Eee0L_IMWjydgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kOCzPBM8Eee0L_IMWjydgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kOCzORM8Eee0L_IMWjydgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kOCzOhM8Eee0L_IMWjydgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kOCzOxM8Eee0L_IMWjydgQ"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_m50c4BM8Eee0L_IMWjydgQ" type="Abstraction_Edge" source="_FMDagsh5EeaVlemTikmRHw" target="_kN8sgBM8Eee0L_IMWjydgQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_m50c4xM8Eee0L_IMWjydgQ" type="Abstraction_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_m50c5BM8Eee0L_IMWjydgQ" x="-2" y="-16"/>
@@ -714,16 +568,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m64z4BM8Eee0L_IMWjydgQ" id="(1.0,0.20987654320987653)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m64z4RM8Eee0L_IMWjydgQ" id="(0.0,0.2465753424657534)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ornxtxM8Eee0L_IMWjydgQ" type="StereotypeCommentLink" source="_m50c4BM8Eee0L_IMWjydgQ" target="_ornxsxM8Eee0L_IMWjydgQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ornxuBM8Eee0L_IMWjydgQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ornxvBM8Eee0L_IMWjydgQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiVirtualNetwork.uml#_m5z10BM8Eee0L_IMWjydgQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ornxuRM8Eee0L_IMWjydgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ornxuhM8Eee0L_IMWjydgQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ornxuxM8Eee0L_IMWjydgQ"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_ksw1MIuTEeiu6boZkiJHCA" type="Association_Edge" source="_FMDagsh5EeaVlemTikmRHw" target="_lfOI0jBJEeaSroGqGbZ6jg">
       <children xmi:type="notation:DecorationNode" xmi:id="_ksxcQIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mAoQ0IuTEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -755,16 +599,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l_JqIIuTEeiu6boZkiJHCA" id="(1.0,0.7654320987654321)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l_JqIYuTEeiu6boZkiJHCA" id="(0.5,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ktsCR4uTEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_ksw1MIuTEeiu6boZkiJHCA" target="_ktsCQ4uTEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ktsCSIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ktsCTIuTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_S3gd4Mh5EeaVlemTikmRHw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ktsCSYuTEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ktsCSouTEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ktsCS4uTEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oCZUQIuTEeiu6boZkiJHCA" type="Association_Edge" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_lfOIkTBJEeaSroGqGbZ6jg">
       <children xmi:type="notation:DecorationNode" xmi:id="_oCZ7UIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_oCZ7UYuTEeiu6boZkiJHCA" x="6"/>
@@ -790,16 +624,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pK8QsIuTEeiu6boZkiJHCA" id="(0.7083333333333334,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o0gtsIuTEeiu6boZkiJHCA" id="(0.8214285714285714,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oC9U8YuTEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_oCZUQIuTEeiu6boZkiJHCA" target="_oC8t44uTEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_oC9U8ouTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oC9U9ouTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oC9U84uTEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oC9U9IuTEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oC9U9YuTEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_qDzLUIuTEeiu6boZkiJHCA" type="Association_Edge" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_M5-vQD3vEea-1_BGg-qcjQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_qDzyYIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_rDYZAIuTEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -831,16 +655,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rCIb0IuTEeiu6boZkiJHCA" id="(0.2638888888888889,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rCIb0YuTEeiu6boZkiJHCA" id="(1.0,0.22972972972972974)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qEK-x4uTEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_qDzLUIuTEeiu6boZkiJHCA" target="_qEK-w4uTEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_qEK-yIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qEK-zIuTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qEK-yYuTEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qEK-youTEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qEK-y4uTEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_uh68cIuTEeiu6boZkiJHCA" type="Association_Edge" source="_lfOIkTBJEeaSroGqGbZ6jg" target="_N-VAYE0SEeaqn4OIuRCwEg">
       <children xmi:type="notation:DecorationNode" xmi:id="_uh7jgIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_uh7jgYuTEeiu6boZkiJHCA" y="-20"/>
@@ -998,16 +812,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-yIbkIuTEeiu6boZkiJHCA" id="(0.15822784810126583,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__Iu9sIuTEeiu6boZkiJHCA" id="(0.0967741935483871,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_96g3EYuTEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_96EyMIuTEeiu6boZkiJHCA" target="_96gQA4uTEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_96g3EouTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_96g3FouTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_96g3E4uTEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96g3FIuTEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96g3FYuTEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_AHxY0IuUEeiu6boZkiJHCA" type="Association_Edge" source="_lfOIUDBJEeaSroGqGbZ6jg" target="_lfX6kjBJEeaSroGqGbZ6jg">
       <children xmi:type="notation:DecorationNode" xmi:id="_AHxY04uUEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_AHxY1IuUEeiu6boZkiJHCA" x="-19" y="-1"/>
@@ -1033,16 +837,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BA-4wIuUEeiu6boZkiJHCA" id="(0.832258064516129,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BdqNsIuUEeiu6boZkiJHCA" id="(0.879746835443038,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_AH7w4YuUEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_AHxY0IuUEeiu6boZkiJHCA" target="_AH7J04uUEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_AH7w4ouUEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AH7w5ouUEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AH7w44uUEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AH7w5IuUEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AH7w5YuUEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_D7StwIuUEeiu6boZkiJHCA" type="Association_Edge" source="_lfOIUDBJEeaSroGqGbZ6jg" target="_7ro1kEJwEea-2Meh9kw1kA">
       <children xmi:type="notation:DecorationNode" xmi:id="_D7Stw4uUEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FEX1sIuUEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1074,16 +868,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FDPNQIuUEeiu6boZkiJHCA" id="(1.0,0.5)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FDPNQYuUEeiu6boZkiJHCA" id="(0.5,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_D7aCh4uUEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_D7StwIuUEeiu6boZkiJHCA" target="_D7aCg4uUEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_D7aCiIuUEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D7apkouUEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D7aCiYuUEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D7apkIuUEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D7apkYuUEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_GuspgIuUEeiu6boZkiJHCA" type="Association_Edge" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_lfOIUDBJEeaSroGqGbZ6jg">
       <children xmi:type="notation:DecorationNode" xmi:id="_GutQkIuUEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_GutQkYuUEeiu6boZkiJHCA" x="2" y="12"/>
@@ -1108,15 +892,195 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GuspgouUEeiu6boZkiJHCA" points="[517, 112, -643984, -643984]$[675, 107, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JaKxQIuUEeiu6boZkiJHCA" id="(1.0,0.2891566265060241)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_GvHgQIuUEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_GuspgIuUEeiu6boZkiJHCA" target="_GvG5M4uUEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_GvHgQYuUEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GvHgRYuUEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_jHjjoaasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfOIUDBJEeaSroGqGbZ6jg" target="_jHi8kKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jHjjoqasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHjjpqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jHjjo6asEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHjjpKasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHjjpaasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jHq4ZKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_AHxY0IuUEeiu6boZkiJHCA" target="_jHq4YKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jHq4ZaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHrfcqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jHq4ZqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHrfcKasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHrfcaasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jH0CUaasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_D7StwIuUEeiu6boZkiJHCA" target="_jHzbQKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jH0CUqasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jH0CVqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jH0CU6asEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jH0CVKasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jH0CVaasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jICExKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfOIkTBJEeaSroGqGbZ6jg" target="_jICEwKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jICExaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jICEyaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jICExqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jICEx6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jICEyKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jIRVV6asEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_jIRVU6asEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jIRVWKasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIRVXKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIRVWaasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIRVWqasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIRVW6asEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jIXb9KasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_oCZUQIuTEeiu6boZkiJHCA" target="_jIXb8KasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jIXb9aasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIXb-aasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIXb9qasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIXb96asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIXb-KasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jIdilKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qDzLUIuTEeiu6boZkiJHCA" target="_jIdikKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jIdilaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIdimaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIdilqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIdil6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIdimKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jIk3UKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GuspgIuUEeiu6boZkiJHCA" target="_jIkQQKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jIk3UaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIk3VaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_oWBRAPTaEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GvHgQouUEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GvHgQ4uUEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GvHgRIuUEeiu6boZkiJHCA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIk3UqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIk3U6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIk3VKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jIuBRKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfX5hTBJEeaSroGqGbZ6jg" target="_jIuBQKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jIuBRaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIuoUaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiVirtualNetwork.uml#_02QCUPUlEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIuBRqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIuBR6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIuoUKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jI945KasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfX6KTBJEeaSroGqGbZ6jg" target="_jI944KasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jI945aasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jI-f8KasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jI945qasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jI9456asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jI946KasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jJO-pKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfX6kjBJEeaSroGqGbZ6jg" target="_jJO-oKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jJPlsKasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJPltKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJPlsaasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJPlsqasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJPls6asEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jJXhhKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_96EyMIuTEeiu6boZkiJHCA" target="_jJXhgKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jJXhhaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJXhiaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJXhhqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJXhh6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJXhiKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jJjHtKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_M5-vQD3vEea-1_BGg-qcjQ" target="_jJjHsKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jJjHtaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJjHuaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJjHtqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJjHt6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJjHuKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jJ5tAaasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7ro1kEJwEea-2Meh9kw1kA" target="_jJ5F86asEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jJ5tAqasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJ5tBqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJ5tA6asEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJ5tBKasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJ5tBaasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jKEFFKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_N-VAYE0SEeaqn4OIuRCwEg" target="_jKEFEKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jKEFFaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKEFGaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKEFFqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKEFF6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKEFGKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jKPrRKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_FMDagsh5EeaVlemTikmRHw" target="_jKPrQKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jKPrRaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKQSUqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKPrRqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKQSUKasEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKQSUaasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jKY1NKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_m50c4BM8Eee0L_IMWjydgQ" target="_jKY1MKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jKY1NaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKZcQaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiVirtualNetwork.uml#_m5z10BM8Eee0L_IMWjydgQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKY1NqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKY1N6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKZcQKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jKdttKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ksw1MIuTEeiu6boZkiJHCA" target="_jKdtsKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jKdttaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKdtuaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_S3gd4Mh5EeaVlemTikmRHw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKdttqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKdtt6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKdtuKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jKqiBKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_kN8sgBM8Eee0L_IMWjydgQ" target="_jKqiAKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jKqiBaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKqiCaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKqiBqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKqiB6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKqiCKasEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_IjOs8EQ7EeaktYCiiVTurg" type="PapyrusUMLClassDiagram" name="VirtualNwDetails" measurementUnit="Pixel">
@@ -1186,14 +1150,6 @@
       <element xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jqyx8UQ7EeaktYCiiVTurg" x="648" y="24" height="203"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_JrFs-0Q7EeaktYCiiVTurg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JrFs_EQ7EeaktYCiiVTurg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JrFs_kQ7EeaktYCiiVTurg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrFs_UQ7EeaktYCiiVTurg" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_3UXPQ0XREeaB8vMnkFQLXQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_3UXPREXREeaB8vMnkFQLXQ" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3UXPRkXREeaB8vMnkFQLXQ" name="BASE_ELEMENT">
@@ -1241,7 +1197,7 @@
           <layoutConstraint xmi:type="notation:Location" xmi:id="_X0rgMxMwEee0L_IMWjydgQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_X0rgNBMwEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjo98AEeW-BtRsuJPbqg"/>
+          <element xmi:type="ecore:EObject" href="TapiCommon.uml#_xEvjo98AEeW-BtRsuJPbqg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_X0rgNRMwEee0L_IMWjydgQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_YOkmhkXSEeaB8vMnkFQLXQ"/>
@@ -1262,15 +1218,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOkmk0XSEeaB8vMnkFQLXQ"/>
       </children>
       <element xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOkmgUXSEeaB8vMnkFQLXQ" x="10" y="33" width="454" height="194"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_YOwzw0XSEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_YOwzxEXSEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YOwzxkXSEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOwzxUXSEeaB8vMnkFQLXQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOkmgUXSEeaB8vMnkFQLXQ" x="10" y="33" width="454" height="257"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ZTws8EXSEeaB8vMnkFQLXQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_ZTws8kXSEeaB8vMnkFQLXQ" type="Class_NameLabel"/>
@@ -1322,29 +1270,21 @@
       <element xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZTws8UXSEeaB8vMnkFQLXQ" x="641" y="276" height="140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZT86M0XSEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ZT86NEXSEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZT86NkXSEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZT86NUXSEeaB8vMnkFQLXQ" x="200"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZhWss4uTEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ZhWstIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZhWstouTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_gz8iQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_gz8iQaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gz8iQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZhWstYuTEeiu6boZkiJHCA" x="210" y="-67"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gz8iQqasEeqJcvXkREZ1XQ" x="848" y="24"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_civaE4uTEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_civaFIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_civaFouTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_g0hxEKasEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_g0hxEaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g0hxE6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_civaFYuTEeiu6boZkiJHCA" x="210" y="-67"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g0hxEqasEeqJcvXkREZ1XQ" x="210" y="33"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_IjOs8UQ7EeaktYCiiVTurg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_IjOs8kQ7EeaktYCiiVTurg"/>
@@ -1352,36 +1292,6 @@
       <owner xmi:type="uml:Package" href="TapiVirtualNetwork.uml#_RD4zsC50Eea0_JngOlSKcA"/>
     </styles>
     <element xmi:type="uml:Package" href="TapiVirtualNetwork.uml#_RD4zsC50Eea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_JrFs_0Q7EeaktYCiiVTurg" type="StereotypeCommentLink" source="_Jqyx8EQ7EeaktYCiiVTurg" target="_JrFs-0Q7EeaktYCiiVTurg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_JrFtAEQ7EeaktYCiiVTurg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JrFtBEQ7EeaktYCiiVTurg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JrFtAUQ7EeaktYCiiVTurg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JrFtAkQ7EeaktYCiiVTurg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JrFtA0Q7EeaktYCiiVTurg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YOwzx0XSEeaB8vMnkFQLXQ" type="StereotypeCommentLink" source="_YOkmgEXSEeaB8vMnkFQLXQ" target="_YOwzw0XSEeaB8vMnkFQLXQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_YOwzyEXSEeaB8vMnkFQLXQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YOwzzEXSEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YOwzyUXSEeaB8vMnkFQLXQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YOwzykXSEeaB8vMnkFQLXQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YOwzy0XSEeaB8vMnkFQLXQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZT86N0XSEeaB8vMnkFQLXQ" type="StereotypeCommentLink" source="_ZTws8EXSEeaB8vMnkFQLXQ" target="_ZT86M0XSEeaB8vMnkFQLXQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZT86OEXSEeaB8vMnkFQLXQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZT86PEXSEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZT86OUXSEeaB8vMnkFQLXQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZT86OkXSEeaB8vMnkFQLXQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZT86O0XSEeaB8vMnkFQLXQ"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_ZgZqcIuTEeiu6boZkiJHCA" type="Association_Edge" source="_YOkmgEXSEeaB8vMnkFQLXQ" target="_Jqyx8EQ7EeaktYCiiVTurg">
       <children xmi:type="notation:DecorationNode" xmi:id="_ZgaRgIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgaRgYuTEeiu6boZkiJHCA" x="-1" y="19"/>
@@ -1404,16 +1314,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_ZgZqcYuTEeiu6boZkiJHCA"/>
       <element xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZgZqcouTEeiu6boZkiJHCA" points="[464, 125, -643984, -643984]$[648, 130, -643984, -643984]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZhWst4uTEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_ZgZqcIuTEeiu6boZkiJHCA" target="_ZhWss4uTEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZhWsuIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZhWsvIuTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZhWsuYuTEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZhWsuouTEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZhWsu4uTEeiu6boZkiJHCA"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t-AIwKasEeqJcvXkREZ1XQ" id="(1.0,0.35797665369649806)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_chqcAIuTEeiu6boZkiJHCA" type="Association_Edge" source="_YOkmgEXSEeaB8vMnkFQLXQ" target="_ZTws8EXSEeaB8vMnkFQLXQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_chrDEIuTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
@@ -1446,16 +1347,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dphb8IuTEeiu6boZkiJHCA" id="(0.5,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dphb8YuTEeiu6boZkiJHCA" id="(0.0,0.5)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_civaF4uTEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_chqcAIuTEeiu6boZkiJHCA" target="_civaE4uTEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_civaGIuTEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_civaHIuTEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_civaGYuTEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_civaGouTEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_civaG4uTEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_fvhfIIuTEeiu6boZkiJHCA" type="Association_Edge" source="_Jqyx8EQ7EeaktYCiiVTurg" target="_Jqyx8EQ7EeaktYCiiVTurg">
       <children xmi:type="notation:DecorationNode" xmi:id="_fvhfI4uTEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gva14IuTEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1487,5 +1378,26 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_guFZIIuTEeiu6boZkiJHCA" id="(1.0,0.6699507389162561)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_guFZIYuTEeiu6boZkiJHCA" id="(0.6055363321799307,1.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_gz8iRKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Jqyx8EQ7EeaktYCiiVTurg" target="_gz8iQKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_gz8iRaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gz8iSaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gz8iRqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gz8iR6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gz8iSKasEeqJcvXkREZ1XQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_g0hxFKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YOkmgEXSEeaB8vMnkFQLXQ" target="_g0hxEKasEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_g0hxFaasEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g0hxGaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g0hxFqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g0hxF6asEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g0hxGKasEeqJcvXkREZ1XQ"/>
+    </edges>
   </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_qwcnoKasEeqJcvXkREZ1XQ"/>
 </xmi:XMI>
diff --git a/UML/TapiVirtualNetwork.uml b/UML/TapiVirtualNetwork.uml
index 8260446c..7a373207 100644
--- a/UML/TapiVirtualNetwork.uml
+++ b/UML/TapiVirtualNetwork.uml
@@ -96,7 +96,7 @@ License: This module is distributed under the Apache License 2.0</body>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_02QCbPUlEeWQB8HQFBfkJQ" name="vnwConstraint" type="_BBDOEPTgEeWQB8HQFBfkJQ" isUnique="false" effect="read"/>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_02QCbfUlEeWQB8HQFBfkJQ" name="connSchedule" isUnique="false" effect="read">
-            <type xmi:type="uml:Class" href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
+            <type xmi:type="uml:DataType" href="TapiCommon.uml#_-ijf4FtVEeexvMtO2oNM9g"/>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_02QCbvUlEeWQB8HQFBfkJQ" name="service" type="_--7mUPTUEeWQB8HQFBfkJQ" direction="out"/>
         </ownedOperation>
@@ -132,7 +132,7 @@ License: This module is distributed under the Apache License 2.0</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BIpz0EXSEeaB8vMnkFQLXQ" value="*"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_BBDOGfTgEeWQB8HQFBfkJQ" name="requestedCapacity">
-          <type xmi:type="uml:DataType" href="TapiTopology.uml#_rNbewL1-EeWdore3Cxez9g"/>
+          <type xmi:type="uml:DataType" href="TapiCommon.uml#_rNbewL1-EeWdore3Cxez9g"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_BBDOEvTgEeWQB8HQFBfkJQ" name="serviceLevel">
           <ownedComment xmi:type="uml:Comment" xmi:id="_BBDOE_TgEeWQB8HQFBfkJQ">
@@ -187,7 +187,7 @@ At the lowest level of recursion, a FC represents a cross-connection within an N
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jxy0gD3vEea-1_BGg-qcjQ" value="*"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_--7mWvTUEeWQB8HQFBfkJQ" name="_schedule" aggregation="composite">
-          <type xmi:type="uml:Class" href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
+          <type xmi:type="uml:DataType" href="TapiCommon.uml#_-ijf4FtVEeexvMtO2oNM9g"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_--7mW_TUEeWQB8HQFBfkJQ" name="_state" aggregation="composite">
           <type xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>

From 385977435ca0006f5a33d32da6df0bfde70f529c Mon Sep 17 00:00:00 2001
From: amazzini <andrea.mazzini@nokia.com>
Date: Thu, 11 Jun 2020 15:10:34 +0200
Subject: [PATCH 4/6] PhotonicMedia: see "2020-06-09 TAPI Meeting notes"

Notification: added DEVICE to ObjectType
VirtualNtw: "schedule" type changed to "tapi-common:time-range"
Connectivity: minor corrections in comments
Adding YANG and TREE modules
---
 UML/TapiConnectivity.notation             | 9347 +++++++++++----------
 UML/TapiConnectivity.uml                  |    5 +-
 UML/TapiEquipment.notation                | 6388 +++++++-------
 UML/TapiPhotonicMedia.notation            | 1882 ++---
 UML/TapiPhotonicMedia.uml                 |   68 +-
 UML/TapiStreaming.notation                |  600 +-
 UML/TapiTopology.notation                 |    5 +-
 UML/TapiVirtualNetwork.notation           |  385 +-
 YANG/tapi-connectivity@2020-04-23.yang    |   10 +-
 YANG/tapi-notification@2020-04-23.yang    |    4 +
 YANG/tapi-photonic-media@2020-04-23.tree  |  276 +-
 YANG/tapi-photonic-media@2020-04-23.yang  |   81 +-
 YANG/tapi-streaming@2020-04-23.tree       | 4944 +++++------
 YANG/tapi-streaming@2020-04-23.yang       |    2 +
 YANG/tapi-virtual-network@2020-04-23.tree |   24 +-
 YANG/tapi-virtual-network@2020-04-23.yang |   13 +-
 16 files changed, 12154 insertions(+), 11880 deletions(-)

diff --git a/UML/TapiConnectivity.notation b/UML/TapiConnectivity.notation
index 54b94628..177f0a80 100644
--- a/UML/TapiConnectivity.notation
+++ b/UML/TapiConnectivity.notation
@@ -1,642 +1,642 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style">
   <notation:Diagram xmi:id="_vmgeMDBFEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="ConnectivityServiceDetails" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_0G9yhzBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_0G9yiDBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_0G9yiTBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0G9yijBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0G9yizBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_Ygt4EK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4Es8M2kIEeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygt4Ea1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygt4Eq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4EtL4EUcEeWEwNCluy4jrw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygt4E61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-sK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_WFu44u_qEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-sa1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-sq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Wuyu0q1bEeiIjuV0HZnJAQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-s61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-tK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TyD6Qv4yEea_VPdGG2-szQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-ta1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-tq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MKK0kIfWEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-t61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-uK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nfDxo-_pEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-ua1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-vK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-va1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ygz-vq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-v61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0G9zbDBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0G9zbTBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G9zbjBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zbzBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0G9zcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0G9zcTBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0G9zcjBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G9zczBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zdDBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0G9zdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0G9zdjBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0G9zdzBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G9zeDBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zeTBFEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zpzBFEeam35bpdXJzEw" x="222" y="56" width="298" height="186"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_0G91jDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_0G91jTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_0G91jjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0G91jzBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0G91kDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_TfFtEK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Hk2vsK1lEeiqCPid09Hqfw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtEa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtEq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_lY2XULvZEeWYrqoqXLgguw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtE61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtFK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_3bhE4L2BEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtFa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtFq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_-YtW8L11EeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtF61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtGK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_caIFkNnlEeWIOYiRCk5bbQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtGa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtGq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ru76gGNFEee0bPnI-Gt-mQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtG61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtHK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_l8TgscF3EeaALJQAf08uAg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtHa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TfFtHq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_wt-RckXOEeaB8vMnkFQLXQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtH61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_IDjM0G2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_snvNYW2pEeqjr-4srHPKHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_IDjM0W2rEeqjr-4srHPKHw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_IGelAG2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_SqFjIm2qEeqjr-4srHPKHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_IGelAW2rEeqjr-4srHPKHw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0G928TBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0G928jBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G928zBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G929DBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0G929TBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0G929jBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0G929zBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G92-DBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G92-TBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0G92-jBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0G92-zBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0G92_DBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G92_TBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G92_jBFEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G93LDBFEeam35bpdXJzEw" x="208" y="-280" width="393" height="281"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_0HHioDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_0HHioTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_0HHiojBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHiozBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHipDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_TBEu8KSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBEu8aSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBFWAKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ihp2oUwPEeewALXL7BvPYw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWAaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBFWAqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sWmP8J_BEeiO_KvaRsULdw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWA6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBFWBKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWBaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBFWBqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWB6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBF9EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9EaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBF9EqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9E6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBF9FKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9FaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBF9FqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9F6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TBF9GKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9GaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ElhScHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_EeCKYHJbEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ElhScXJbEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHjbDBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHjbTBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHjbjBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjbzBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHjcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHjcTBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHjcjBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHjczBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjdDBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHjdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHjdjBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHjdzBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHjeDBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjeTBFEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjpzBFEeam35bpdXJzEw" x="719" y="220" width="362" height="321"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_0HHjqDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_0HHjqTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_0HHjqjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHjqzBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHjrDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_0HHjrTBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHj0zBFEeam35bpdXJzEw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_0HHj1DBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHj8zBFEeam35bpdXJzEw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_1F-OIP42Eea_VPdGG2-szQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1F-OIf42Eea_VPdGG2-szQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHj9DBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHj9TBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHj9jBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHj9zBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHj-DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHj-TBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHj-jBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHj-zBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHj_DBFEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHj_TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHj_jBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHj_zBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHkADBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHkATBFEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHkLzBFEeam35bpdXJzEw" x="718" y="13" width="304" height="95"/>
+    <children xsi:type="notation:Shape" xmi:id="_0G9yhzBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_0G9yiDBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_0G9yiTBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0G9yijBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0G9yizBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_Ygt4EK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_4Es8M2kIEeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygt4Ea1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygt4Eq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_4EtL4EUcEeWEwNCluy4jrw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygt4E61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-sK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_WFu44u_qEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-sa1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-sq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_Wuyu0q1bEeiIjuV0HZnJAQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-s61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-tK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_TyD6Qv4yEea_VPdGG2-szQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-ta1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-tq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MKK0kIfWEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-t61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-uK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nfDxo-_pEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-ua1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-vK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-va1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Ygz-vq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-v61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0G9zbDBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0G9zbTBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G9zbjBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zbzBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0G9zcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0G9zcTBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0G9zcjBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G9zczBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zdDBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0G9zdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0G9zdjBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0G9zdzBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G9zeDBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zeTBFEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zpzBFEeam35bpdXJzEw" x="222" y="56" width="298" height="186"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_0G91jDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_0G91jTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_0G91jjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0G91jzBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0G91kDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_TfFtEK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_Hk2vsK1lEeiqCPid09Hqfw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtEa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtEq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_lY2XULvZEeWYrqoqXLgguw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtE61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtFK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_3bhE4L2BEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtFa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtFq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_-YtW8L11EeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtF61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtGK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_caIFkNnlEeWIOYiRCk5bbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtGa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtGq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ru76gGNFEee0bPnI-Gt-mQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtG61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtHK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_l8TgscF3EeaALJQAf08uAg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtHa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TfFtHq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_wt-RckXOEeaB8vMnkFQLXQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtH61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_IDjM0G2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_snvNYW2pEeqjr-4srHPKHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_IDjM0W2rEeqjr-4srHPKHw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_IGelAG2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_SqFjIm2qEeqjr-4srHPKHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_IGelAW2rEeqjr-4srHPKHw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0G928TBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0G928jBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G928zBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G929DBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0G929TBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0G929jBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0G929zBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G92-DBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G92-TBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0G92-jBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0G92-zBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0G92_DBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G92_TBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G92_jBFEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G93LDBFEeam35bpdXJzEw" x="200" y="-300" width="421" height="301"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_0HHioDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_0HHioTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_0HHiojBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHiozBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHipDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_TBEu8KSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBEu8aSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBFWAKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ihp2oUwPEeewALXL7BvPYw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWAaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBFWAqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sWmP8J_BEeiO_KvaRsULdw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWA6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBFWBKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWBaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBFWBqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWB6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBF9EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9EaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBF9EqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9E6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBF9FKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9FaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBF9FqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9F6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_TBF9GKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9GaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_ElhScHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_EeCKYHJbEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ElhScXJbEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHjbDBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHjbTBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHjbjBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjbzBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHjcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHjcTBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHjcjBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHjczBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjdDBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHjdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHjdjBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHjdzBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHjeDBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjeTBFEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjpzBFEeam35bpdXJzEw" x="719" y="220" width="362" height="321"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_0HHjqDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_0HHjqTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_0HHjqjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHjqzBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHjrDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_0HHjrTBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHj0zBFEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_0HHj1DBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHj8zBFEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_1F-OIP42Eea_VPdGG2-szQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_1F-OIf42Eea_VPdGG2-szQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHj9DBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHj9TBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHj9jBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHj9zBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHj-DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHj-TBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHj-jBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHj-zBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHj_DBFEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHj_TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHj_jBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHj_zBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHkADBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHkATBFEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHkLzBFEeam35bpdXJzEw" x="718" y="13" width="304" height="95"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_0HHlMDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_0HHlMTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_0HHlMjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHlMzBFEeam35bpdXJzEw" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_0HHlMDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_0HHlMTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_0HHlMjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHlMzBFEeam35bpdXJzEw" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHlNDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_QrZ4EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrZ4EaSfEeiKJbr6a5Jjpg"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHlNDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_QrZ4EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrZ4EaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrafIKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafIaSfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrafIKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafIaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrafIqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafI6SfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrafIqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafI6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrafJKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_hHoP4nIzEeeSiaQ95-6r9w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafJaSfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrafJKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_hHoP4nIzEeeSiaQ95-6r9w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafJaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrafJqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafJ6SfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrafJqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafJ6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrafKKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafKaSfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrafKKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafKaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrafKqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafK6SfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrafKqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafK6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrbGMKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGMaSfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrbGMKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGMaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrbGMqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGM6SfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrbGMqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGM6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrbGNKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGNaSfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrbGNKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGNaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QrbGNqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGN6SfEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_QrbGNqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGN6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHl3DBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHl3TBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHl3jBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHl3zBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHl3DBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHl3TBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHl3jBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHl3zBFEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHl4DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHl4TBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHl4jBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHl4zBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHl5DBFEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHl4DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHl4TBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHl4jBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHl4zBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHl5DBFEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHl5TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHl5jBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHl5zBFEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHl6DBFEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHl6TBFEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHl5TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHl5jBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHl5zBFEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHl6DBFEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHl6TBFEeam35bpdXJzEw"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHmFzBFEeam35bpdXJzEw" x="100" y="315" width="350" height="366"/>
+      <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHmFzBFEeam35bpdXJzEw" x="100" y="315" width="350" height="366"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_0HtYijBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0HtYizBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0HtYjTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_nfDxoO_pEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_0HtYijBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_0HtYizBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0HtYjTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_nfDxoO_pEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HtYjDBFEeam35bpdXJzEw" x="222" y="15"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HtYjDBFEeam35bpdXJzEw" x="222" y="15"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_0HtY5DBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0HtY5TBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0HtY5zBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Generalization" href="TapiConnectivity.uml#_ntHGoO_nEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_0HtY5DBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_0HtY5TBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0HtY5zBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ntHGoO_nEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HtY5jBFEeam35bpdXJzEw" x="222" y="15"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HtY5jBFEeam35bpdXJzEw" x="222" y="15"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_0KiqJjBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0KiqJzBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0KiqKTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Generalization" href="TapiConnectivity.uml#_ttEd8O_nEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_0KiqJjBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_0KiqJzBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0KiqKTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ttEd8O_nEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KiqKDBFEeam35bpdXJzEw" x="729" y="16"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0KiqKDBFEeam35bpdXJzEw" x="729" y="16"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_0K_WATBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0K_WAjBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0K_WBDBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_0K_WATBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_0K_WAjBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0K_WBDBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0K_WAzBFEeam35bpdXJzEw" x="747" y="-128"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0K_WAzBFEeam35bpdXJzEw" x="747" y="-128"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__WkxFDIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="__WkxFTIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__WkxFzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="ecore:EObject" href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="__WkxFDIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="__WkxFTIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__WkxFzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__WkxFjIvEeamvfKYyWmELQ" x="241" y="-38"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__WkxFjIvEeamvfKYyWmELQ" x="241" y="-38"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_bsaAXDI_EeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_bsaAXTI_EeamvfKYyWmELQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bsaAXzI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_bsaAXDI_EeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bsaAXTI_EeamvfKYyWmELQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bsaAXzI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bsaAXjI_EeamvfKYyWmELQ" x="497" y="230"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bsaAXjI_EeamvfKYyWmELQ" x="497" y="230"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_IOfcwDK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IOfcwTK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IOfcwzK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_IOfcwDK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IOfcwTK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IOfcwzK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IOfcwjK-EeaULOmJRJKM0Q" x="497" y="230"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IOfcwjK-EeaULOmJRJKM0Q" x="497" y="230"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_McsitjK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_McsitzK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_McsiuTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_McsitjK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_McsitzK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_McsiuTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_McsiuDK-EeaULOmJRJKM0Q" x="497" y="230"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_McsiuDK-EeaULOmJRJKM0Q" x="497" y="230"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_NrbXtzM-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_NrbXuDM-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NrbXujM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_NrbXtzM-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_NrbXuDM-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_NrbXujM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NrbXuTM-EeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NrbXuTM-EeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_D-1g_DM_EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D-1g_TM_EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D-1g_zM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_D-1g_DM_EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_D-1g_TM_EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_D-1g_zM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-1g_jM_EeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_D-1g_jM_EeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_TVE1cjNAEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TVE1czNAEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TVE1dTNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_TVE1cjNAEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_TVE1czNAEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_TVE1dTNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TVE1dDNAEeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TVE1dDNAEeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_VKOxfzNGEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_VKOxgDNGEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VKOxgjNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_VKOxfzNGEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_VKOxgDNGEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VKOxgjNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VKOxgTNGEeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VKOxgTNGEeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4F8a9jN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4F8a9zN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4F8a-TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_4F8a9jN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_4F8a9zN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4F8a-TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8a-DN4Eea0Br-ajMxp_A" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4F8a-DN4Eea0Br-ajMxp_A" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4GFkcDN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4GFkcTN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4GFkczN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_4GFkcDN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_4GFkcTN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4GFkczN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GFkcjN4Eea0Br-ajMxp_A" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4GFkcjN4Eea0Br-ajMxp_A" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_AX3hvzOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_AX3hwDOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AX3hwjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_AX3hvzOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_AX3hwDOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_AX3hwjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AX3hwTOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_AX3hwTOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BAFYGjOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYGzOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYHTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BAFYGjOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYGzOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYHTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYHDOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYHDOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BAFYLjOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYLzOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYMTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BAFYLjOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYLzOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYMTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYMDOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYMDOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BBa0_jOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa0_zOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa1ATOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BBa0_jOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa0_zOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa1ATOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa1ADOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa1ADOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BBa1EjOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa1EzOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa1FTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BBa1EjOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa1EzOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa1FTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa1FDOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa1FDOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_U-QXEDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_U-QXETOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_U-QXEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_U-QXEDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_U-QXETOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_U-QXEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U-QXEjOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_U-QXEjOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_tkFcXj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_tkFcXz4ZEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tkFcYT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_tkFcXj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_tkFcXz4ZEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_tkFcYT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tkFcYD4ZEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tkFcYD4ZEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Z5H0DD4hEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Z5H0DT4hEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5H0Dz4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_Z5H0DD4hEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Z5H0DT4hEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Z5H0Dz4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5H0Dj4hEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Z5H0Dj4hEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_LNo6Bz4lEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_LNo6CD4lEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LNo6Cj4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_LNo6Bz4lEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_LNo6CD4lEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LNo6Cj4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LNo6CT4lEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LNo6CT4lEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_bBUh8z4yEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_bBUh9D4yEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bBUh9j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_bBUh8z4yEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bBUh9D4yEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bBUh9j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bBUh9T4yEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bBUh9T4yEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_nvYTgD4zEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_nvYTgT4zEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nvYTgz4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_nvYTgD4zEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_nvYTgT4zEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvYTgz4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nvYTgj4zEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nvYTgj4zEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_dJdy0z41Eea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_dJdy1D41Eea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dJdy1j41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_dJdy0z41Eea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dJdy1D41Eea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dJdy1j41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJdy1T41Eea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dJdy1T41Eea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Y0aHUkTYEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Y0aHU0TYEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Y0aHVUTYEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_Y0aHUkTYEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Y0aHU0TYEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Y0aHVUTYEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y0aHVETYEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y0aHVETYEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4ABuQUTbEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4ABuQkTbEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4ABuRETbEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_4ABuQUTbEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_4ABuQkTbEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4ABuRETbEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ABuQ0TbEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4ABuQ0TbEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Yt7SX0TdEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Yt7SYETdEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Yt7SYkTdEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_Yt7SX0TdEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Yt7SYETdEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Yt7SYkTdEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yt7SYUTdEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yt7SYUTdEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hPFlHkTpEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hPFlH0TpEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hPFlIUTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_hPFlHkTpEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hPFlH0TpEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hPFlIUTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPFlIETpEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hPFlIETpEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_v2-InkT2Eead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_v2-In0T2Eead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_v2-IoUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_v2-InkT2Eead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_v2-In0T2Eead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_v2-IoUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v2-IoET2Eead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_v2-IoET2Eead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2MOgUEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2MOgUUXCEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2MOgU0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_2MOgUEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2MOgUUXCEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2MOgU0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2MOgUkXCEeaB8vMnkFQLXQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2MOgUkXCEeaB8vMnkFQLXQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wxpQg0XOEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wxpQhEXOEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wxpQhkXOEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_wxpQg0XOEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wxpQhEXOEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wxpQhkXOEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxpQhUXOEeaB8vMnkFQLXQ" x="-24" y="-121"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wxpQhUXOEeaB8vMnkFQLXQ" x="-24" y="-121"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_fWXagEXQEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fWXagUXQEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fWXag0XQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_fWXagEXQEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_fWXagUXQEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fWXag0XQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fWXagkXQEeaB8vMnkFQLXQ" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fWXagkXQEeaB8vMnkFQLXQ" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_5fJ-kEzyEeabHNlo0UKXdA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5fJ-kUzyEeabHNlo0UKXdA" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5fJ-k0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_5fJ-kEzyEeabHNlo0UKXdA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_5fJ-kUzyEeabHNlo0UKXdA" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_5fJ-k0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5fJ-kkzyEeabHNlo0UKXdA" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5fJ-kkzyEeabHNlo0UKXdA" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_OFgD8E0LEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OFgD8U0LEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OFgD800LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_OFgD8E0LEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_OFgD8U0LEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_OFgD800LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OFgD8k0LEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_OFgD8k0LEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_GrVGJk0NEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_GrVGJ00NEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GrVGKU0NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_GrVGJk0NEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_GrVGJ00NEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_GrVGKU0NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GrVGKE0NEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GrVGKE0NEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_fI-rdE0OEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fI-rdU0OEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fI-rd00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_fI-rdE0OEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_fI-rdU0OEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fI-rd00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fI-rdk0OEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fI-rdk0OEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_SJv7100WEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_SJv72E0WEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SJv72k0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_SJv7100WEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_SJv72E0WEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SJv72k0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SJv72U0WEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SJv72U0WEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_HcjjME0XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_HcjjMU0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HcjjM00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_HcjjME0XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HcjjMU0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HcjjM00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HcjjMk0XEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HcjjMk0XEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_VjY7b00XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_VjY7cE0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VjY7ck0XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_VjY7b00XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_VjY7cE0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VjY7ck0XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VjY7cU0XEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VjY7cU0XEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mmZT8k0YEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mmZT800YEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mmZT9U0YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_mmZT8k0YEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_mmZT800YEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_mmZT9U0YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mmZT9E0YEeaqn4OIuRCwEg" x="610" y="173"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mmZT9E0YEeaqn4OIuRCwEg" x="610" y="173"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_7Hv64HTwEeaoHe3mKsYq3Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7Hv64XTwEeaoHe3mKsYq3Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7Hv643TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_7Hv64HTwEeaoHe3mKsYq3Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_7Hv64XTwEeaoHe3mKsYq3Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7Hv643TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Hv64nTwEeaoHe3mKsYq3Q" x="610" y="173"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7Hv64nTwEeaoHe3mKsYq3Q" x="610" y="173"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZdeNvXrqEeavcODnuX7FyA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ZdeNvnrqEeavcODnuX7FyA" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZdeNwHrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_ZdeNvXrqEeavcODnuX7FyA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ZdeNvnrqEeavcODnuX7FyA" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZdeNwHrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZdeNv3rqEeavcODnuX7FyA" x="610" y="173"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZdeNv3rqEeavcODnuX7FyA" x="610" y="173"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_cEGHhcFhEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_cEGHhsFhEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cEGHiMFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_cEGHhcFhEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cEGHhsFhEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cEGHiMFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cEGHh8FhEeaALJQAf08uAg" x="610" y="173"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cEGHh8FhEeaALJQAf08uAg" x="610" y="173"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_aW_QMsFiEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_aW_QM8FiEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aW_QNcFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_aW_QMsFiEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_aW_QM8FiEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aW_QNcFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aW_QNMFiEeaALJQAf08uAg" x="610" y="173"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aW_QNMFiEeaALJQAf08uAg" x="610" y="173"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qlD9QMFpEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qlD9QcFpEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qlD9Q8FpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_qlD9QMFpEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_qlD9QcFpEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_qlD9Q8FpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qlD9QsFpEeaALJQAf08uAg" x="610" y="173"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_qlD9QsFpEeaALJQAf08uAg" x="610" y="173"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_l-Zyc8F3EeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_l-ZydMF3EeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l-ZydsF3EeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
+    <children xsi:type="notation:Shape" xmi:id="_l-Zyc8F3EeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_l-ZydMF3EeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_l-ZydsF3EeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l-ZydcF3EeaALJQAf08uAg" x="-62" y="-130"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_l-ZydcF3EeaALJQAf08uAg" x="-62" y="-130"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_M1cfE8F5EeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_M1cfFMF5EeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M1cfFsF5EeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
+    <children xsi:type="notation:Shape" xmi:id="_M1cfE8F5EeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_M1cfFMF5EeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M1cfFsF5EeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M1cfFcF5EeaALJQAf08uAg" x="-34" y="-280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M1cfFcF5EeaALJQAf08uAg" x="-34" y="-280"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_kLocxu33EeaRONVEJOGI1g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_kLocx-33EeaRONVEJOGI1g" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kLocye33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_kLocxu33EeaRONVEJOGI1g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_kLocx-33EeaRONVEJOGI1g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kLocye33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kLocyO33EeaRONVEJOGI1g" x="87" y="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kLocyO33EeaRONVEJOGI1g" x="87" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rwI9oPlIEeaQEoLj_Ia_cg" type="Interface_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_rwI9ovlIEeaQEoLj_Ia_cg" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rwI9o_lIEeaQEoLj_Ia_cg" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rwI9pPlIEeaQEoLj_Ia_cg" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_rwI9oPlIEeaQEoLj_Ia_cg" type="Interface_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_rwI9ovlIEeaQEoLj_Ia_cg" type="Interface_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rwI9o_lIEeaQEoLj_Ia_cg" type="Interface_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rwI9pPlIEeaQEoLj_Ia_cg" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rwI9pflIEeaQEoLj_Ia_cg" type="Interface_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rwI9pvlIEeaQEoLj_Ia_cg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rwI9p_lIEeaQEoLj_Ia_cg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rwI9qPlIEeaQEoLj_Ia_cg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9qflIEeaQEoLj_Ia_cg"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rwI9pflIEeaQEoLj_Ia_cg" type="Interface_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rwI9pvlIEeaQEoLj_Ia_cg"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rwI9p_lIEeaQEoLj_Ia_cg"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rwI9qPlIEeaQEoLj_Ia_cg"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9qflIEeaQEoLj_Ia_cg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rwI9qvlIEeaQEoLj_Ia_cg" type="Interface_OperationCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_rbQHsPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_v1KHMPPkEeinaYo1FpF9OA" name="maskLabel">
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rwI9qvlIEeaQEoLj_Ia_cg" type="Interface_OperationCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_rbQHsPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_v1KHMPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -645,11 +645,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_WHPN6FJvEeWcs7ZjyujtOg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rbQHsfPkEeinaYo1FpF9OA"/>
+          <element href="TapiConnectivity.uml#_WHPN6FJvEeWcs7ZjyujtOg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_rbQHsfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_rbQuwPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_w2LfUPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_rbQuwPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_w2LfUPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -658,11 +658,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_WHPN81JvEeWcs7ZjyujtOg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rbQuwfPkEeinaYo1FpF9OA"/>
+          <element href="TapiConnectivity.uml#_WHPN81JvEeWcs7ZjyujtOg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_rbQuwfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_tAPvkPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_xWWNIPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_tAPvkPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_xWWNIPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -671,11 +671,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_AnTcAKU5EeWkWNPM1BHzGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_tAPvkfPkEeinaYo1FpF9OA"/>
+          <element href="TapiConnectivity.uml#_AnTcAKU5EeWkWNPM1BHzGA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_tAPvkfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_tAQWoPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_zKENgPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_tAQWoPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_zKENgPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -684,11 +684,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_qH8fkL2NEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_tAQWofPkEeinaYo1FpF9OA"/>
+          <element href="TapiConnectivity.uml#_qH8fkL2NEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_tAQWofPkEeinaYo1FpF9OA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_tAQWovPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_zjrnYPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_tAQWovPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_zjrnYPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -697,11 +697,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_lQR28L2WEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_tAQWo_PkEeinaYo1FpF9OA"/>
+          <element href="TapiConnectivity.uml#_lQR28L2WEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_tAQWo_PkEeinaYo1FpF9OA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_udvBQPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_0BrK8PPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_udvBQPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_0BrK8PPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -710,11 +710,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_WHPN5VJvEeWcs7ZjyujtOg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_udvBQfPkEeinaYo1FpF9OA"/>
+          <element href="TapiConnectivity.uml#_WHPN5VJvEeWcs7ZjyujtOg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_udvBQfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_udvoUPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xmi:type="notation:StringListValueStyle" xmi:id="_0gHacPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xsi:type="notation:Shape" xmi:id="_udvoUPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xsi:type="notation:StringListValueStyle" xmi:id="_0gHacPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -723,4920 +723,4941 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_udvoUfPkEeinaYo1FpF9OA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rwI9q_lIEeaQEoLj_Ia_cg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rwI9rPlIEeaQEoLj_Ia_cg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rwI9rflIEeaQEoLj_Ia_cg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9rvlIEeaQEoLj_Ia_cg"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rwI9r_lIEeaQEoLj_Ia_cg" visible="false" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rwI9sPlIEeaQEoLj_Ia_cg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rwI9sflIEeaQEoLj_Ia_cg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rwI9svlIEeaQEoLj_Ia_cg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9s_lIEeaQEoLj_Ia_cg"/>
-      </children>
-      <element xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9oflIEeaQEoLj_Ia_cg" x="-300" y="-456" height="155"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_ysyms_lIEeaQEoLj_Ia_cg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ysymtPlIEeaQEoLj_Ia_cg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ysymtvlIEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ysymtflIEeaQEoLj_Ia_cg" x="189" y="-337"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BDPgIP4xEea_VPdGG2-szQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BDPgIv4xEea_VPdGG2-szQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BDPgI_4xEea_VPdGG2-szQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BDPgJP4xEea_VPdGG2-szQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BDPgJf4xEea_VPdGG2-szQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_n4dMgNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_nxcI8jLCEeaULOmJRJKM0Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dMgdoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4dzkNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_c8MLxDLEEeaULOmJRJKM0Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzkdoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4dzktoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_wGVAhMF-EeaALJQAf08uAg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzk9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4dzlNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_xyluAsF-EeaALJQAf08uAg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzldoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4dzltoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_Ca3vhP4zEea_VPdGG2-szQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzl9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4dzmNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_MjEHhP4zEea_VPdGG2-szQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzmdoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4dzmtoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_tAVeAE5qEeeicu4cm-7qRg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzm9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4eaoNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_5TDM0U5qEeeicu4cm-7qRg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4eaodoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n4eaotoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_3_SWwL11EeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4eao9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BDPgJv4xEea_VPdGG2-szQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BDPgJ_4xEea_VPdGG2-szQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BDPgKP4xEea_VPdGG2-szQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgKf4xEea_VPdGG2-szQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BDPgKv4xEea_VPdGG2-szQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BDPgK_4xEea_VPdGG2-szQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BDPgLP4xEea_VPdGG2-szQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BDPgLf4xEea_VPdGG2-szQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgLv4xEea_VPdGG2-szQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BDPgL_4xEea_VPdGG2-szQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BDPgMP4xEea_VPdGG2-szQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BDPgMf4xEea_VPdGG2-szQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BDPgMv4xEea_VPdGG2-szQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgM_4xEea_VPdGG2-szQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgIf4xEea_VPdGG2-szQ" x="-283" y="185" width="302" height="296"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__Y_BEIfVEeeirpBaj87qAw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="__Y_BEofVEeeirpBaj87qAw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__Y_oIIfVEeeirpBaj87qAw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__Y_oIYfVEeeirpBaj87qAw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__Y_oIofVEeeirpBaj87qAw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_l_p30NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_p30doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_p30toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_p309oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_qe4NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe4doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_qe4toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe49oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_qe5NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe5doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_qe5toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe59oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_qe6NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe6doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_qe6toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe69oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_rF8NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_rF8doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_rF8toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_rF89oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l_rF9NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_rF9doHEeeYx-v40uoW_Q"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__Y_oI4fVEeeirpBaj87qAw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__Y_oJIfVEeeirpBaj87qAw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__Y_oJYfVEeeirpBaj87qAw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_oJofVEeeirpBaj87qAw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__Y_oJ4fVEeeirpBaj87qAw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__Y_oKIfVEeeirpBaj87qAw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__Y_oKYfVEeeirpBaj87qAw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__Y_oKofVEeeirpBaj87qAw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_oK4fVEeeirpBaj87qAw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__Y_oLIfVEeeirpBaj87qAw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__Y_oLYfVEeeirpBaj87qAw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__Y_oLofVEeeirpBaj87qAw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__Y_oL4fVEeeirpBaj87qAw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_oMIfVEeeirpBaj87qAw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_BEYfVEeeirpBaj87qAw" x="-281" y="-28" height="205"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_SCXpgIhDEeeOl5P_FBJSmA" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_SCY3oIhDEeeOl5P_FBJSmA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SCY3oYhDEeeOl5P_FBJSmA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SCZesIhDEeeOl5P_FBJSmA" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_SCZesYhDEeeOl5P_FBJSmA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_N4ymgKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4ymgaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N4z0oKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4z0oaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N4z0oqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4z0o6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N4z0pKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4z0paSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N40bsqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40bs6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N40btKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40btaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N40btqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40bt6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N40buKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40buaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N41CwKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N41CwaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N41CwqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N41Cw6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_N41CxKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_N41CxaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_zAk_kHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_y4n9cHJbEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_zAk_kXJbEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_SCZesohDEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_SCZes4hDEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_SCZetIhDEeeOl5P_FBJSmA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCZetYhDEeeOl5P_FBJSmA"/>
+          <element href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_udvoUfPkEeinaYo1FpF9OA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rwI9q_lIEeaQEoLj_Ia_cg"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rwI9rPlIEeaQEoLj_Ia_cg"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rwI9rflIEeaQEoLj_Ia_cg"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9rvlIEeaQEoLj_Ia_cg"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rwI9r_lIEeaQEoLj_Ia_cg" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rwI9sPlIEeaQEoLj_Ia_cg"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rwI9sflIEeaQEoLj_Ia_cg"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rwI9svlIEeaQEoLj_Ia_cg"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9s_lIEeaQEoLj_Ia_cg"/>
+      </children>
+      <element href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9oflIEeaQEoLj_Ia_cg" x="-300" y="-456" height="155"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ysyms_lIEeaQEoLj_Ia_cg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ysymtPlIEeaQEoLj_Ia_cg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ysymtvlIEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ysymtflIEeaQEoLj_Ia_cg" x="189" y="-337"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BDPgIP4xEea_VPdGG2-szQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BDPgIv4xEea_VPdGG2-szQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BDPgI_4xEea_VPdGG2-szQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BDPgJP4xEea_VPdGG2-szQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BDPgJf4xEea_VPdGG2-szQ" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_n4dMgNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_nxcI8jLCEeaULOmJRJKM0Q"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dMgdoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4dzkNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_c8MLxDLEEeaULOmJRJKM0Q"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzkdoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4dzktoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_wGVAhMF-EeaALJQAf08uAg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzk9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4dzlNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_xyluAsF-EeaALJQAf08uAg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzldoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4dzltoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_Ca3vhP4zEea_VPdGG2-szQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzl9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4dzmNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_MjEHhP4zEea_VPdGG2-szQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzmdoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4dzmtoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_tAVeAE5qEeeicu4cm-7qRg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzm9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4eaoNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_5TDM0U5qEeeicu4cm-7qRg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4eaodoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_n4eaotoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_3_SWwL11EeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4eao9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BDPgJv4xEea_VPdGG2-szQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BDPgJ_4xEea_VPdGG2-szQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BDPgKP4xEea_VPdGG2-szQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgKf4xEea_VPdGG2-szQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BDPgKv4xEea_VPdGG2-szQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BDPgK_4xEea_VPdGG2-szQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BDPgLP4xEea_VPdGG2-szQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BDPgLf4xEea_VPdGG2-szQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgLv4xEea_VPdGG2-szQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BDPgL_4xEea_VPdGG2-szQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BDPgMP4xEea_VPdGG2-szQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BDPgMf4xEea_VPdGG2-szQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BDPgMv4xEea_VPdGG2-szQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgM_4xEea_VPdGG2-szQ"/>
+      </children>
+      <element href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgIf4xEea_VPdGG2-szQ" x="-283" y="185" width="302" height="296"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__Y_BEIfVEeeirpBaj87qAw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="__Y_BEofVEeeirpBaj87qAw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__Y_oIIfVEeeirpBaj87qAw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__Y_oIYfVEeeirpBaj87qAw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__Y_oIofVEeeirpBaj87qAw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_l_p30NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_p30doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_p30toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_p309oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_qe4NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe4doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_qe4toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe49oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_qe5NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe5doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_qe5toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe59oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_qe6NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe6doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_qe6toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe69oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_rF8NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_rF8doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_rF8toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_rF89oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_l_rF9NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_rF9doHEeeYx-v40uoW_Q"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__Y_oI4fVEeeirpBaj87qAw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__Y_oJIfVEeeirpBaj87qAw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__Y_oJYfVEeeirpBaj87qAw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_oJofVEeeirpBaj87qAw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__Y_oJ4fVEeeirpBaj87qAw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__Y_oKIfVEeeirpBaj87qAw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__Y_oKYfVEeeirpBaj87qAw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__Y_oKofVEeeirpBaj87qAw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_oK4fVEeeirpBaj87qAw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__Y_oLIfVEeeirpBaj87qAw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__Y_oLYfVEeeirpBaj87qAw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__Y_oLofVEeeirpBaj87qAw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__Y_oL4fVEeeirpBaj87qAw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_oMIfVEeeirpBaj87qAw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_BEYfVEeeirpBaj87qAw" x="-281" y="-28" height="205"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_SCXpgIhDEeeOl5P_FBJSmA" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_SCY3oIhDEeeOl5P_FBJSmA" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SCY3oYhDEeeOl5P_FBJSmA" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SCZesIhDEeeOl5P_FBJSmA" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_SCZesYhDEeeOl5P_FBJSmA" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_N4ymgKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4ymgaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N4z0oKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4z0oaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N4z0oqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4z0o6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N4z0pKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4z0paSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N40bsqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40bs6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N40btKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40btaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N40btqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40bt6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N40buKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40buaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N41CwKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N41CwaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N41CwqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N41Cw6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_N41CxKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_N41CxaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_zAk_kHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_y4n9cHJbEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_zAk_kXJbEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_SCZesohDEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_SCZes4hDEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_SCZetIhDEeeOl5P_FBJSmA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCZetYhDEeeOl5P_FBJSmA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_SCZetohDEeeOl5P_FBJSmA" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_SCZet4hDEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_SCZeuIhDEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_SCZeuYhDEeeOl5P_FBJSmA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCZeuohDEeeOl5P_FBJSmA"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_SCZetohDEeeOl5P_FBJSmA" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_SCZet4hDEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_SCZeuIhDEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_SCZeuYhDEeeOl5P_FBJSmA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCZeuohDEeeOl5P_FBJSmA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_SCZeu4hDEeeOl5P_FBJSmA" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_SCZevIhDEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_SCZevYhDEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_SCZevohDEeeOl5P_FBJSmA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCZev4hDEeeOl5P_FBJSmA"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_SCZeu4hDEeeOl5P_FBJSmA" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_SCZevIhDEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_SCZevYhDEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_SCZevohDEeeOl5P_FBJSmA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCZev4hDEeeOl5P_FBJSmA"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCXpgYhDEeeOl5P_FBJSmA" x="715" y="-296" width="386" height="239"/>
+      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCXpgYhDEeeOl5P_FBJSmA" x="715" y="-296" width="386" height="239"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__j-OAK1aEeiIjuV0HZnJAQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="__j-OAq1aEeiIjuV0HZnJAQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__j-OA61aEeiIjuV0HZnJAQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__j-OBK1aEeiIjuV0HZnJAQ" y="15"/>
+    <children xsi:type="notation:Shape" xmi:id="__j-OAK1aEeiIjuV0HZnJAQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="__j-OAq1aEeiIjuV0HZnJAQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__j-OA61aEeiIjuV0HZnJAQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__j-OBK1aEeiIjuV0HZnJAQ" y="15"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__j-OBa1aEeiIjuV0HZnJAQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_QFABQK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_AwfVYK1kEeiqCPid09Hqfw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABQa1kEeiqCPid09Hqfw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__j-OBa1aEeiIjuV0HZnJAQ" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_QFABQK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_AwfVYK1kEeiqCPid09Hqfw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABQa1kEeiqCPid09Hqfw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QFABQq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_RhdgwL2HEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABQ61kEeiqCPid09Hqfw"/>
+        <children xsi:type="notation:Shape" xmi:id="_QFABQq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_RhdgwL2HEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABQ61kEeiqCPid09Hqfw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QFABRK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_GqeeML2JEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABRa1kEeiqCPid09Hqfw"/>
+        <children xsi:type="notation:Shape" xmi:id="_QFABRK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_GqeeML2JEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABRa1kEeiqCPid09Hqfw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QFABRq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_YQtngIoPEeivCevppATXng"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABR61kEeiqCPid09Hqfw"/>
+        <children xsi:type="notation:Shape" xmi:id="_QFABRq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_YQtngIoPEeivCevppATXng"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABR61kEeiqCPid09Hqfw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QFABSK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_-XrtYIfbEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABSa1kEeiqCPid09Hqfw"/>
+        <children xsi:type="notation:Shape" xmi:id="_QFABSK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_-XrtYIfbEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABSa1kEeiqCPid09Hqfw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QFABSq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_6ZZS4IfbEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABS61kEeiqCPid09Hqfw"/>
+        <children xsi:type="notation:Shape" xmi:id="_QFABSq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_6ZZS4IfbEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABS61kEeiqCPid09Hqfw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QFABTK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_1dtjYIfYEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABTa1kEeiqCPid09Hqfw"/>
+        <children xsi:type="notation:Shape" xmi:id="_QFABTK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element href="TapiPathComputation.uml#_1dtjYIfYEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABTa1kEeiqCPid09Hqfw"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__j-OBq1aEeiIjuV0HZnJAQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__j-OB61aEeiIjuV0HZnJAQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__j-OCK1aEeiIjuV0HZnJAQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OCa1aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__j-OBq1aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__j-OB61aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__j-OCK1aEeiIjuV0HZnJAQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-OCa1aEeiIjuV0HZnJAQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__j-OCq1aEeiIjuV0HZnJAQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__j-OC61aEeiIjuV0HZnJAQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__j-ODK1aEeiIjuV0HZnJAQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__j-ODa1aEeiIjuV0HZnJAQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-ODq1aEeiIjuV0HZnJAQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__j-OCq1aEeiIjuV0HZnJAQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__j-OC61aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__j-ODK1aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__j-ODa1aEeiIjuV0HZnJAQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-ODq1aEeiIjuV0HZnJAQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__j-OD61aEeiIjuV0HZnJAQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__j-OEK1aEeiIjuV0HZnJAQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__j-OEa1aEeiIjuV0HZnJAQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__j-OEq1aEeiIjuV0HZnJAQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OE61aEeiIjuV0HZnJAQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__j-OD61aEeiIjuV0HZnJAQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__j-OEK1aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__j-OEa1aEeiIjuV0HZnJAQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__j-OEq1aEeiIjuV0HZnJAQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-OE61aEeiIjuV0HZnJAQ"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OAa1aEeiIjuV0HZnJAQ" x="-282" y="-183" height="141"/>
+      <element href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-OAa1aEeiIjuV0HZnJAQ" x="-282" y="-280" height="238"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wsu4gKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wsu4gaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wsu4g6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <children xsi:type="notation:Shape" xmi:id="_XxHVoKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XxHVoasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxHVo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wsu4gqavEeqJcvXkREZ1XQ" x="422" y="56"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XxHVoqsnEeqiJu55eR3W2w" x="422" y="56"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wtOAsKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wtOAsaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtOAs6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XySaUKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XySaUasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XySaU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtOAsqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XySaUqsnEeqiJu55eR3W2w" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wtVVcKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wtVVcaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtVVc6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XybkQKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XybkQasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XybkQ6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtVVcqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XybkQqsnEeqiJu55eR3W2w" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wtdRQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wtdRQaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtdRQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XylVQKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XylVQasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XylVQ6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtdRQqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XylVQqsnEeqiJu55eR3W2w" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wtnCQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wtnCQaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtnCQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xyw7cKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xyw7casnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xyw7c6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtnCQqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xyw7cqsnEeqiJu55eR3W2w" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wtu-EKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wtu-EaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtu-E6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xy7TgKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xy7TgasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xy7Tg6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wtu-EqavEeqJcvXkREZ1XQ" x="422" y="-44"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xy7TgqsnEeqiJu55eR3W2w" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wt2S0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wt2S0aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wt2S06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XzGSoKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XzGSoasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzGSo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wt2S0qavEeqJcvXkREZ1XQ" x="422" y="-44"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XzGSoqsnEeqiJu55eR3W2w" x="422" y="-44"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wuAq4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wuAq4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuAq46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XzjloKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XzjloasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzkMsKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wuAq4qavEeqJcvXkREZ1XQ" x="408" y="-280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XzjloqsnEeqiJu55eR3W2w" x="408" y="-280"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wuvDo6avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wuvDpKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuvDpqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <children xsi:type="notation:Shape" xmi:id="_X3dOMKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X3dOMasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X3dOM6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wuvDpaavEeqJcvXkREZ1XQ" x="919" y="220"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X3dOMqsnEeqiJu55eR3W2w" x="919" y="220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wvTrYKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wvTrYaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvUScKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_X5IpMKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X5IpMasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5IpM6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wvTrYqavEeqJcvXkREZ1XQ" x="919" y="120"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X5IpMqsnEeqiJu55eR3W2w" x="919" y="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wvaZEKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wvaZEaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvaZE6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_X5ToUKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X5ToUasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5UPYKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wvaZEqavEeqJcvXkREZ1XQ" x="919" y="120"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X5ToUqsnEeqiJu55eR3W2w" x="919" y="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wvlYMKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wvlYMaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvlYM6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_X51MwKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X51MwasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X51z0KsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wvlYMqavEeqJcvXkREZ1XQ" x="918" y="13"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X51MwqsnEeqiJu55eR3W2w" x="918" y="13"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wv3FAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wv3FAaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wv3sEKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_X648sKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X648sasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X648s6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wv3FAqavEeqJcvXkREZ1XQ" x="300" y="315"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X648sqsnEeqiJu55eR3W2w" x="300" y="315"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wwkPoKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wwkPoaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wwkPo6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <children xsi:type="notation:Shape" xmi:id="_X9F8IKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X9F8IasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X9F8I6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wwkPoqavEeqJcvXkREZ1XQ" x="-100" y="-456"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X9F8IqsnEeqiJu55eR3W2w" x="-100" y="-456"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ww3xoKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ww3xoaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ww3xo6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_X-LhQKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X-LhQasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X-MIUKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ww3xoqavEeqJcvXkREZ1XQ" x="-83" y="185"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X-LhQqsnEeqiJu55eR3W2w" x="-83" y="185"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wxakMKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wxakMaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wxakM6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <children xsi:type="notation:Shape" xmi:id="_X_0gAKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_X_0gAasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X_0gA6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxakMqavEeqJcvXkREZ1XQ" x="-81" y="-28"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X_0gAqsnEeqiJu55eR3W2w" x="-81" y="-28"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wyOcgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wyOcgaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wyOcg6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xsi:type="notation:Shape" xmi:id="_YBbCgKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YBbCgasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YBbCg6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wyOcgqavEeqJcvXkREZ1XQ" x="915" y="-296"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YBbCgqsnEeqiJu55eR3W2w" x="915" y="-296"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wzFYIKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wzFYIaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wzFYI6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_YDZYcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YDZYcasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YDZ_gKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wzFYIqavEeqJcvXkREZ1XQ" x="-82" y="-183"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YDZYcqsnEeqiJu55eR3W2w" x="-82" y="-183"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_vmgeMTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_vmgeMjBFEeam35bpdXJzEw"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GnTpEIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_vmgeMTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_vmgeMjBFEeam35bpdXJzEw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_GnTpEIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_M1cfF8F5EeaALJQAf08uAg" type="StereotypeCommentLink" target="_M1cfE8F5EeaALJQAf08uAg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_M1cfGMF5EeaALJQAf08uAg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M1cfHMF5EeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M1cfGcF5EeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M1cfGsF5EeaALJQAf08uAg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M1cfG8F5EeaALJQAf08uAg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_kLocyu33EeaRONVEJOGI1g" type="StereotypeCommentLink" target="_kLocxu33EeaRONVEJOGI1g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_kLocy-33EeaRONVEJOGI1g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kLocz-33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kLoczO33EeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kLocze33EeaRONVEJOGI1g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kLoczu33EeaRONVEJOGI1g"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_lT2KsIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__Y_BEIfVEeeirpBaj87qAw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xwIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oFyG0IuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xwYuQEeiu6boZkiJHCA" x="-1" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xwouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oLPOkIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xw4uQEeiu6boZkiJHCA" x="-1" y="12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xxIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oQNOIIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xxYuQEeiu6boZkiJHCA" x="25" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xxouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oWjGsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xx4uQEeiu6boZkiJHCA" x="-26" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xyIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oduFsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xyYuQEeiu6boZkiJHCA" x="13" y="-21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xyouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oj93oIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xy4uQEeiu6boZkiJHCA" x="-12" y="-19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_lT2KsYuQEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lT2KsouQEeiu6boZkiJHCA" points="[222, 102, -643984, -643984]$[49, 65, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nlKtEIuQEeiu6boZkiJHCA" id="(0.0,0.40860215053763443)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oo4M0IuQEeiu6boZkiJHCA" id="(1.0,0.7804878048780488)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xDbXQIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-UIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-UYuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-UouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-U4uQEeiu6boZkiJHCA" x="12" y="5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-VIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-VYuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-VouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-V4uQEeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-WIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-WYuQEeiu6boZkiJHCA" x="-3" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-WouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-W4uQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_xDbXQYuQEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xDbXQouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zRejMIuQEeiu6boZkiJHCA" id="(0.08142493638676845,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y-LMsIuQEeiu6boZkiJHCA" id="(0.06711409395973154,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_z_dqkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqk4uQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqlIuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqlYuQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqlouQEeiu6boZkiJHCA" x="16" y="12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_z_dql4uQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqmIuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqmYuQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqmouQEeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqm4uQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqnIuQEeiu6boZkiJHCA" y="10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqnYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqnouQEeiu6boZkiJHCA" x="2" y="18"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_z_dqkYuQEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z_dqkouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1udjAIuQEeiu6boZkiJHCA" id="(0.6921119592875318,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Weg0IuQEeiu6boZkiJHCA" id="(0.8456375838926175,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3JCDkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0G91jDBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqoIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqoYuQEeiu6boZkiJHCA" x="-3" y="-6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqoouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqo4uQEeiu6boZkiJHCA" x="12" y="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqpIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqpYuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqpouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqp4uQEeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqqIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JDRsIuQEeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3JDRsYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JDRsouQEeiu6boZkiJHCA" x="5" y="16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_3JCDkYuQEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3JCDkouQEeiu6boZkiJHCA" points="[359, 23, -643984, -643984]$[365, -58, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXm6IK1dEeiIjuV0HZnJAQ" id="(0.4597315436241611,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bhqvUK1YEeiIjuV0HZnJAQ" id="(0.38676844783715014,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_8oadYIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_BDPgIP4xEea_VPdGG2-szQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_8obEcIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IKD6EK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obEcYuQEeiu6boZkiJHCA" x="16" y="1"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8obEcouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IRySsK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obEc4uQEeiu6boZkiJHCA" y="-4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8obEdIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IaHvUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obEdYuQEeiu6boZkiJHCA" x="27" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8obEdouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IizxQK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obrgIuQEeiu6boZkiJHCA" x="-27" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8obrgYuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ip3bgK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obrgouQEeiu6boZkiJHCA" x="9" y="-16"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8obrg4uQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IzCloK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obrhIuQEeiu6boZkiJHCA" x="-15" y="-12"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_8oadYYuQEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8oadYouQEeiu6boZkiJHCA" points="[222, 218, -643984, -643984]$[120, 218, -643984, -643984]$[120, 292, -643984, -643984]$[19, 292, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__GDkgIuQEeiu6boZkiJHCA" id="(0.0,0.8709677419354839)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-Mcb8IuQEeiu6boZkiJHCA" id="(1.0,0.3614864864864865)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_DM_ksIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_DM_ks4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XRyRsK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALwIuREeiu6boZkiJHCA" x="8" y="4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DNALwYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XdXPkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALwouREeiu6boZkiJHCA" x="-6" y="-1"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DNALw4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XlwWkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALxIuREeiu6boZkiJHCA" x="12" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DNALxYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XujGMK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALxouREeiu6boZkiJHCA" x="-10" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DNALx4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X3uQUK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALyIuREeiu6boZkiJHCA" x="10" y="-14"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DNALyYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YAsmIK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALyouREeiu6boZkiJHCA" x="-11" y="-19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_DM_ksYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DM_ksouREeiu6boZkiJHCA" points="[311, 242, -643984, -643984]$[277, 313, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EXtEUIuREeiu6boZkiJHCA" id="(0.2080536912751678,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EvkxwIuREeiu6boZkiJHCA" id="(0.5142857142857142,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_G3oqcIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRgIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IFBqoIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRgYuREeiu6boZkiJHCA" x="21" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRgouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IJukcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRg4uREeiu6boZkiJHCA" x="14" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRhIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IO5_YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRhYuREeiu6boZkiJHCA" x="48" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRhouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IVrVwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRh4uREeiu6boZkiJHCA" x="-47" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRiIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IeLxgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRiYuREeiu6boZkiJHCA" x="15" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRiouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IjNbcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRi4uREeiu6boZkiJHCA" x="-12" y="-11"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_G3oqcYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G3oqcouREeiu6boZkiJHCA" points="[436, 242, -643984, -643984]$[461, 308, -643984, -643984]$[719, 308, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IAcFkIuREeiu6boZkiJHCA" id="(0.802013422818792,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IAcFkYuREeiu6boZkiJHCA" id="(0.0,0.24922118380062305)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_LlPpEIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpE4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NH68wIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpFIuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpFYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NMMYwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpFouREeiu6boZkiJHCA" x="-38" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpF4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NTc3UIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpGIuREeiu6boZkiJHCA" x="46" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpGYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NaTtQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpGouREeiu6boZkiJHCA" x="-46" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpG4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ngf00IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpHIuREeiu6boZkiJHCA" x="8" y="-21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpHYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NkztEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpHouREeiu6boZkiJHCA" x="-13" y="-17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_LlPpEYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LlPpEouREeiu6boZkiJHCA" points="[800, 441, -643984, -643984]$[800, 480, -643984, -643984]$[660, 480, -643984, -643984]$[660, 400, -643984, -643984]$[719, 400, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDK_oIuREeiu6boZkiJHCA" id="(0.22375690607734808,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDK_oYuREeiu6boZkiJHCA" id="(0.0,0.5607476635514018)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_S_bisIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_SCXpgIhDEeeOl5P_FBJSmA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_S_bis4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UPBiUIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_bitIuREeiu6boZkiJHCA" x="-135" y="4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S_bitYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UV-e4IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_bitouREeiu6boZkiJHCA" x="-119" y="7"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S_bit4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Uc3xEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_biuIuREeiu6boZkiJHCA" x="65" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S_cJwIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ui45gIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_cJwYuREeiu6boZkiJHCA" x="-6" y="-30"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S_cJwouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Un2SAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_cJw4uREeiu6boZkiJHCA" x="19" y="17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S_cJxIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UsfhcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_cJxYuREeiu6boZkiJHCA" x="-17" y="16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_S_bisYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S_bisouREeiu6boZkiJHCA" points="[719, 255, -643984, -643984]$[665, 255, -643984, -643984]$[665, -128, -643984, -643984]$[715, -142, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UKluQIuREeiu6boZkiJHCA" id="(0.0,0.12461059190031153)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UKluQYuREeiu6boZkiJHCA" id="(0.0,0.702928870292887)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZFXmMIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHjqDBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNQYuREeiu6boZkiJHCA" x="-3" y="2"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNQouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNQ4uREeiu6boZkiJHCA" x="18" y="5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNRYuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNRouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNR4uREeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNSIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNSYuREeiu6boZkiJHCA" x="-4" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNSouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNS4uREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZFXmMYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZFXmMouREeiu6boZkiJHCA" points="[870, 230, -643984, -643984]$[865, 108, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4qm_oHJaEeq3NYg-TXSAxQ" id="(0.4447513812154696,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6x6qYHJaEeq3NYg-TXSAxQ" id="(0.5328947368421053,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_cGt3UIuREeiu6boZkiJHCA" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_0HHjqDBFEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_cGueYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueYYuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cGueYouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueY4uREeiu6boZkiJHCA" x="1" y="-6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cGueZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueZYuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cGueZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueZ4uREeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cGueaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueaYuREeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cGueaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGuea4uREeiu6boZkiJHCA" x="4" y="19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_cGt3UYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cGt3UouREeiu6boZkiJHCA" points="[892, -90, -643984, -643984]$[877, 13, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dhRJwIuREeiu6boZkiJHCA" id="(0.42487046632124353,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dKx8YIuREeiu6boZkiJHCA" id="(0.5296052631578947,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_iiLsYKSfEeiKJbr6a5Jjpg" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_SCXpgIhDEeeOl5P_FBJSmA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_iiLsY6SfEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lNAT4KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTcKSfEeiKJbr6a5Jjpg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTcaSfEeiKJbr6a5Jjpg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lUpM8KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTcqSfEeiKJbr6a5Jjpg" x="-1" y="1"/>
+    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_M1cfF8F5EeaALJQAf08uAg" type="StereotypeCommentLink" target="_M1cfE8F5EeaALJQAf08uAg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_M1cfGMF5EeaALJQAf08uAg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M1cfHMF5EeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M1cfGcF5EeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M1cfGsF5EeaALJQAf08uAg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M1cfG8F5EeaALJQAf08uAg"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_kLocyu33EeaRONVEJOGI1g" type="StereotypeCommentLink" target="_kLocxu33EeaRONVEJOGI1g">
+      <styles xsi:type="notation:FontStyle" xmi:id="_kLocy-33EeaRONVEJOGI1g"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kLocz-33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kLoczO33EeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kLocze33EeaRONVEJOGI1g"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kLoczu33EeaRONVEJOGI1g"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_lT2KsIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__Y_BEIfVEeeirpBaj87qAw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xwIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oFyG0IuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xwYuQEeiu6boZkiJHCA" x="-1" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xwouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oLPOkIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xw4uQEeiu6boZkiJHCA" x="-1" y="12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xxIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oQNOIIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xxYuQEeiu6boZkiJHCA" x="25" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xxouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oWjGsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xx4uQEeiu6boZkiJHCA" x="-26" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xyIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oduFsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xyYuQEeiu6boZkiJHCA" x="13" y="-21"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xyouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oj93oIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xy4uQEeiu6boZkiJHCA" x="-12" y="-19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_lT2KsYuQEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_lT2KsouQEeiu6boZkiJHCA" points="[222, 102, -643984, -643984]$[49, 65, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nlKtEIuQEeiu6boZkiJHCA" id="(0.0,0.40860215053763443)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oo4M0IuQEeiu6boZkiJHCA" id="(1.0,0.7804878048780488)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_xDbXQIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-UIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fEs4AKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-UYuQEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-UouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fOHSsKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-U4uQEeiu6boZkiJHCA" x="12" y="5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-VIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fXDzUKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-VYuQEeiu6boZkiJHCA" x="8" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-VouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ffXawKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-V4uQEeiu6boZkiJHCA" x="-8" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-WIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fnMhEKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-WYuQEeiu6boZkiJHCA" x="5" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-WouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fu6SoKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-W4uQEeiu6boZkiJHCA" x="-8" y="-20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_xDbXQYuQEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xDbXQouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zRejMIuQEeiu6boZkiJHCA" id="(0.09501187648456057,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_y-LMsIuQEeiu6boZkiJHCA" id="(0.06040268456375839,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_z_dqkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqk4uQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_f2wnEKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqlIuQEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqlYuQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gAKasKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqlouQEeiu6boZkiJHCA" x="16" y="12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_z_dql4uQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gKA6QKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqmIuQEeiu6boZkiJHCA" x="8" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqmYuQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gT52EKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqmouQEeiu6boZkiJHCA" x="-8" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqm4uQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gco7UKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqnIuQEeiu6boZkiJHCA" x="8" y="10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqnYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gki6IKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqnouQEeiu6boZkiJHCA" x="-6" y="18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_z_dqkYuQEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z_dqkouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1udjAIuQEeiu6boZkiJHCA" id="(0.665083135391924,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1Weg0IuQEeiu6boZkiJHCA" id="(0.8657718120805369,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_3JCDkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0G91jDBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqoIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gs9PQKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqoYuQEeiu6boZkiJHCA" x="-3" y="-6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqoouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_g2bUUKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqo4uQEeiu6boZkiJHCA" x="12" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqpIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_g_d7kKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqpYuQEeiu6boZkiJHCA" x="8" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqpouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_hHsqgKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqp4uQEeiu6boZkiJHCA" x="-8" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqqIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_hRuJMKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JDRsIuQEeiu6boZkiJHCA" x="8" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_3JDRsYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_haEM4KsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JDRsouQEeiu6boZkiJHCA" x="-3" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_3JCDkYuQEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_3JCDkouQEeiu6boZkiJHCA" points="[359, 23, -643984, -643984]$[365, -58, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iXm6IK1dEeiIjuV0HZnJAQ" id="(0.46308724832214765,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bhqvUK1YEeiIjuV0HZnJAQ" id="(0.38004750593824227,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8oadYIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_BDPgIP4xEea_VPdGG2-szQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_8obEcIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IKD6EK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obEcYuQEeiu6boZkiJHCA" x="16" y="1"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8obEcouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IRySsK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obEc4uQEeiu6boZkiJHCA" y="-4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8obEdIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IaHvUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obEdYuQEeiu6boZkiJHCA" x="27" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8obEdouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IizxQK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obrgIuQEeiu6boZkiJHCA" x="-27" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8obrgYuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ip3bgK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obrgouQEeiu6boZkiJHCA" x="9" y="-16"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8obrg4uQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IzCloK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obrhIuQEeiu6boZkiJHCA" x="-15" y="-12"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_8oadYYuQEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8oadYouQEeiu6boZkiJHCA" points="[222, 218, -643984, -643984]$[120, 218, -643984, -643984]$[120, 292, -643984, -643984]$[19, 292, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__GDkgIuQEeiu6boZkiJHCA" id="(0.0,0.8709677419354839)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-Mcb8IuQEeiu6boZkiJHCA" id="(1.0,0.3614864864864865)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_DM_ksIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_DM_ks4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XRyRsK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALwIuREeiu6boZkiJHCA" x="8" y="4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DNALwYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XdXPkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALwouREeiu6boZkiJHCA" x="-6" y="-1"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DNALw4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XlwWkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALxIuREeiu6boZkiJHCA" x="12" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DNALxYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XujGMK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALxouREeiu6boZkiJHCA" x="-10" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DNALx4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X3uQUK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALyIuREeiu6boZkiJHCA" x="10" y="-14"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DNALyYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YAsmIK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALyouREeiu6boZkiJHCA" x="-11" y="-19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_DM_ksYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DM_ksouREeiu6boZkiJHCA" points="[311, 242, -643984, -643984]$[277, 313, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EXtEUIuREeiu6boZkiJHCA" id="(0.2080536912751678,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EvkxwIuREeiu6boZkiJHCA" id="(0.5142857142857142,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_G3oqcIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRgIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IFBqoIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRgYuREeiu6boZkiJHCA" x="21" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRgouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IJukcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRg4uREeiu6boZkiJHCA" x="14" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRhIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IO5_YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRhYuREeiu6boZkiJHCA" x="48" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRhouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IVrVwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRh4uREeiu6boZkiJHCA" x="-47" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRiIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IeLxgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRiYuREeiu6boZkiJHCA" x="15" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRiouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IjNbcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRi4uREeiu6boZkiJHCA" x="-12" y="-11"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_G3oqcYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_G3oqcouREeiu6boZkiJHCA" points="[436, 242, -643984, -643984]$[461, 308, -643984, -643984]$[719, 308, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IAcFkIuREeiu6boZkiJHCA" id="(0.802013422818792,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IAcFkYuREeiu6boZkiJHCA" id="(0.0,0.24922118380062305)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_LlPpEIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpE4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NH68wIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpFIuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpFYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NMMYwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpFouREeiu6boZkiJHCA" x="-38" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpF4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NTc3UIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpGIuREeiu6boZkiJHCA" x="46" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpGYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NaTtQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpGouREeiu6boZkiJHCA" x="-46" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpG4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ngf00IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpHIuREeiu6boZkiJHCA" x="8" y="-21"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpHYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NkztEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpHouREeiu6boZkiJHCA" x="-13" y="-17"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_LlPpEYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LlPpEouREeiu6boZkiJHCA" points="[800, 441, -643984, -643984]$[800, 480, -643984, -643984]$[660, 480, -643984, -643984]$[660, 400, -643984, -643984]$[719, 400, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDK_oIuREeiu6boZkiJHCA" id="(0.22375690607734808,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDK_oYuREeiu6boZkiJHCA" id="(0.0,0.5607476635514018)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_S_bisIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_SCXpgIhDEeeOl5P_FBJSmA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_S_bis4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UPBiUIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_bitIuREeiu6boZkiJHCA" x="-135" y="4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S_bitYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UV-e4IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_bitouREeiu6boZkiJHCA" x="-119" y="7"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S_bit4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Uc3xEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_biuIuREeiu6boZkiJHCA" x="65" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S_cJwIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ui45gIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_cJwYuREeiu6boZkiJHCA" x="-6" y="-30"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S_cJwouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Un2SAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_cJw4uREeiu6boZkiJHCA" x="19" y="17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S_cJxIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UsfhcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_cJxYuREeiu6boZkiJHCA" x="-17" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_S_bisYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_S_bisouREeiu6boZkiJHCA" points="[719, 255, -643984, -643984]$[665, 255, -643984, -643984]$[665, -128, -643984, -643984]$[715, -142, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UKluQIuREeiu6boZkiJHCA" id="(0.0,0.12461059190031153)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UKluQYuREeiu6boZkiJHCA" id="(0.0,0.702928870292887)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_ZFXmMIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHjqDBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNQYuREeiu6boZkiJHCA" x="-3" y="2"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNQouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNQ4uREeiu6boZkiJHCA" x="18" y="5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNRYuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNRouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNR4uREeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNSIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNSYuREeiu6boZkiJHCA" x="-4" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNSouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNS4uREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_ZFXmMYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZFXmMouREeiu6boZkiJHCA" points="[870, 230, -643984, -643984]$[865, 108, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4qm_oHJaEeq3NYg-TXSAxQ" id="(0.4447513812154696,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6x6qYHJaEeq3NYg-TXSAxQ" id="(0.5328947368421053,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_cGt3UIuREeiu6boZkiJHCA" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_0HHjqDBFEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_cGueYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueYYuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_cGueYouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueY4uREeiu6boZkiJHCA" x="1" y="-6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_cGueZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueZYuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_cGueZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueZ4uREeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_cGueaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueaYuREeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_cGueaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGuea4uREeiu6boZkiJHCA" x="4" y="19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_cGt3UYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cGt3UouREeiu6boZkiJHCA" points="[892, -90, -643984, -643984]$[877, 13, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dhRJwIuREeiu6boZkiJHCA" id="(0.42487046632124353,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dKx8YIuREeiu6boZkiJHCA" id="(0.5296052631578947,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_iiLsYKSfEeiKJbr6a5Jjpg" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_SCXpgIhDEeeOl5P_FBJSmA" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_iiLsY6SfEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lNAT4KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTcKSfEeiKJbr6a5Jjpg" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTcaSfEeiKJbr6a5Jjpg" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lUpM8KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTcqSfEeiKJbr6a5Jjpg" x="-1" y="1"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTc6SfEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lfiOUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTdKSfEeiKJbr6a5Jjpg" x="71" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTc6SfEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lfiOUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTdKSfEeiKJbr6a5Jjpg" x="71" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTdaSfEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lnnzUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTdqSfEeiKJbr6a5Jjpg" x="-71" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTd6SfEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_luJSEKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTeKSfEeiKJbr6a5Jjpg" x="17" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTeaSfEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l39VYKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTeqSfEeiKJbr6a5Jjpg" x="-8" y="-10"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTdaSfEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lnnzUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTdqSfEeiKJbr6a5Jjpg" x="-71" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTd6SfEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_luJSEKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTeKSfEeiKJbr6a5Jjpg" x="17" y="-13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTeaSfEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_l39VYKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTeqSfEeiKJbr6a5Jjpg" x="-8" y="-10"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_iiLsYaSfEeiKJbr6a5Jjpg"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iiLsYqSfEeiKJbr6a5Jjpg" points="[1101, -176, -643984, -643984]$[1179, -176, -643984, -643984]$[1179, -251, -643984, -643984]$[1101, -251, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lFunMKSfEeiKJbr6a5Jjpg" id="(1.0,0.502092050209205)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lFunMaSfEeiKJbr6a5Jjpg" id="(1.0,0.18828451882845187)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_iiLsYaSfEeiKJbr6a5Jjpg"/>
+      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_iiLsYqSfEeiKJbr6a5Jjpg" points="[1101, -176, -643984, -643984]$[1179, -176, -643984, -643984]$[1179, -251, -643984, -643984]$[1101, -251, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lFunMKSfEeiKJbr6a5Jjpg" id="(1.0,0.502092050209205)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lFunMaSfEeiKJbr6a5Jjpg" id="(1.0,0.18828451882845187)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_W6DjoK1bEeiIjuV0HZnJAQ" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__j-OAK1aEeiIjuV0HZnJAQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djo61bEeiIjuV0HZnJAQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_zzraUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6DjpK1bEeiIjuV0HZnJAQ" x="13" y="-11"/>
+    <edges xsi:type="notation:Connector" xmi:id="_W6DjoK1bEeiIjuV0HZnJAQ" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__j-OAK1aEeiIjuV0HZnJAQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djo61bEeiIjuV0HZnJAQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_zzraUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6DjpK1bEeiIjuV0HZnJAQ" x="13" y="-11"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djpa1bEeiIjuV0HZnJAQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_z7zbkK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6Djpq1bEeiIjuV0HZnJAQ" x="29" y="-1"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djpa1bEeiIjuV0HZnJAQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_z7zbkK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6Djpq1bEeiIjuV0HZnJAQ" x="29" y="-1"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djp61bEeiIjuV0HZnJAQ" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0EMikK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6DjqK1bEeiIjuV0HZnJAQ" x="45" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djp61bEeiIjuV0HZnJAQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0EMikK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6DjqK1bEeiIjuV0HZnJAQ" x="45" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djqa1bEeiIjuV0HZnJAQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0M-rIK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6Djqq1bEeiIjuV0HZnJAQ" x="-45" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djqa1bEeiIjuV0HZnJAQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0M-rIK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6Djqq1bEeiIjuV0HZnJAQ" x="-45" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djq61bEeiIjuV0HZnJAQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0V26UK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6DjrK1bEeiIjuV0HZnJAQ" x="17" y="15"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djq61bEeiIjuV0HZnJAQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0V26UK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6DjrK1bEeiIjuV0HZnJAQ" x="17" y="15"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djra1bEeiIjuV0HZnJAQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0eX9IK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6Djrq1bEeiIjuV0HZnJAQ" x="-16" y="13"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djra1bEeiIjuV0HZnJAQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0eX9IK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6Djrq1bEeiIjuV0HZnJAQ" x="-16" y="13"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_W6Djoa1bEeiIjuV0HZnJAQ"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W6Djoq1bEeiIjuV0HZnJAQ" points="[222, 51, -643984, -643984]$[132, 51, -643984, -643984]$[132, -100, -643984, -643984]$[16, -100, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XLDNAK1bEeiIjuV0HZnJAQ" id="(0.0,0.1324200913242009)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XLDNAa1bEeiIjuV0HZnJAQ" id="(1.0,0.5886524822695035)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_W6Djoa1bEeiIjuV0HZnJAQ"/>
+      <element href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_W6Djoq1bEeiIjuV0HZnJAQ" points="[222, 51, -643984, -643984]$[132, 51, -643984, -643984]$[132, -100, -643984, -643984]$[16, -100, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XLDNAK1bEeiIjuV0HZnJAQ" id="(0.0,0.1324200913242009)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XLDNAa1bEeiIjuV0HZnJAQ" id="(0.9956896551724138,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TysjEIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_TytKIIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b3PoUIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKIYEIEeqLl4tIPv2RCg" y="-20"/>
+    <edges xsi:type="notation:Connector" xmi:id="_TysjEIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_TytKIIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_b3PoUIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKIYEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TytKIoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b_lsAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKI4EIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TytKIoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_b_lsAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKI4EIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TytKJIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cI7OMIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKJYEIEeqLl4tIPv2RCg" x="6" y="-90"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TytKJIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cI7OMIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKJYEIEeqLl4tIPv2RCg" x="6" y="-90"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TytKJoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cRcRAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKJ4EIEeqLl4tIPv2RCg" x="-13" y="-43"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TytKJoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cRcRAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKJ4EIEeqLl4tIPv2RCg" x="-13" y="-43"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TytxMIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cZidEIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytxMYEIEeqLl4tIPv2RCg" x="6" y="-50"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TytxMIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cZidEIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytxMYEIEeqLl4tIPv2RCg" x="6" y="-50"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TytxMoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cidvkIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytxM4EIEeqLl4tIPv2RCg" x="-13" y="-83"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_TytxMoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cidvkIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytxM4EIEeqLl4tIPv2RCg" x="-13" y="-83"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_TysjEYEIEeqLl4tIPv2RCg"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_To9YQIEIEeqLl4tIPv2RCg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TysjEoEIEeqLl4tIPv2RCg" points="[450, 440, -643984, -643984]$[520, 440, -643984, -643984]$[520, 743, -643984, -643984]$[450, 743, -643984, -643984]$[450, 680, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UDL2IIEIEeqLl4tIPv2RCg" id="(1.0,0.34153005464480873)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UDL2IYEIEeqLl4tIPv2RCg" id="(1.0,0.9972677595628415)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_TysjEYEIEeqLl4tIPv2RCg"/>
+      <element href="TapiConnectivity.uml#_To9YQIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TysjEoEIEeqLl4tIPv2RCg" points="[450, 440, -643984, -643984]$[520, 440, -643984, -643984]$[520, 743, -643984, -643984]$[450, 743, -643984, -643984]$[450, 680, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UDL2IIEIEeqLl4tIPv2RCg" id="(1.0,0.34153005464480873)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UDL2IYEIEeqLl4tIPv2RCg" id="(1.0,0.9972677595628415)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_hxbHwIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHw4EIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHxIEIEeqLl4tIPv2RCg" y="-20"/>
+    <edges xsi:type="notation:Connector" xmi:id="_hxbHwIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHw4EIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHxIEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHxYEIEeqLl4tIPv2RCg" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHxoEIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHxYEIEeqLl4tIPv2RCg" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHxoEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHx4EIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHyIEIEeqLl4tIPv2RCg" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHx4EIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHyIEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHyYEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHyoEIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHyYEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHyoEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hxbu0IEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbu0YEIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_hxbu0IEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbu0YEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hxbu0oEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbu04EIEeqLl4tIPv2RCg" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_hxbu0oEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbu04EIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_hxbHwYEIEeqLl4tIPv2RCg"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hpEdAIEIEeqLl4tIPv2RCg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hxbHwoEIEeqLl4tIPv2RCg" points="[400, 315, -643984, -643984]$[450, 540, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iDUJAIEIEeqLl4tIPv2RCg" id="(0.8571428571428571,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iDUwEIEIEeqLl4tIPv2RCg" id="(1.0,0.6147540983606558)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_hxbHwYEIEeqLl4tIPv2RCg"/>
+      <element href="TapiConnectivity.uml#_hpEdAIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hxbHwoEIEeqLl4tIPv2RCg" points="[400, 315, -643984, -643984]$[450, 540, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iDUJAIEIEeqLl4tIPv2RCg" id="(0.8571428571428571,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iDUwEIEIEeqLl4tIPv2RCg" id="(1.0,0.6147540983606558)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rm_esIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFwIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFwYEIEeqLl4tIPv2RCg" y="-20"/>
+    <edges xsi:type="notation:Connector" xmi:id="_rm_esIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFwIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFwYEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFwoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFw4EIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFwoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFw4EIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFxIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFxYEIEeqLl4tIPv2RCg" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFxIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFxYEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFxoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFx4EIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFxoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFx4EIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFyIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFyYEIEeqLl4tIPv2RCg" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFyIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFyYEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFyoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFy4EIEeqLl4tIPv2RCg" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFyoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFy4EIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_rm_esYEIEeqLl4tIPv2RCg"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_rfKYYIEIEeqLl4tIPv2RCg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rm_esoEIEeqLl4tIPv2RCg" points="[380, 315, -643984, -643984]$[450, 520, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r3NsAIEIEeqLl4tIPv2RCg" id="(0.8,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r3NsAYEIEeqLl4tIPv2RCg" id="(1.0,0.5601092896174863)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_rm_esYEIEeqLl4tIPv2RCg"/>
+      <element href="TapiConnectivity.uml#_rfKYYIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rm_esoEIEeqLl4tIPv2RCg" points="[380, 315, -643984, -643984]$[450, 520, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_r3NsAIEIEeqLl4tIPv2RCg" id="(0.8,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_r3NsAYEIEeqLl4tIPv2RCg" id="(1.0,0.5601092896174863)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wsu4hKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0G9yhzBFEeam35bpdXJzEw" target="_wsu4gKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wsu4haavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wsvfkKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XxHVpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0G9yhzBFEeam35bpdXJzEw" target="_XxHVoKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XxHVpasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxH8sqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wsu4hqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wsu4h6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wsu4iKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XxHVpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxH8sKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxH8sasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wtOAtKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lT2KsIuQEeiu6boZkiJHCA" target="_wtOAsKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wtOAtaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtOAuaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XySaVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lT2KsIuQEeiu6boZkiJHCA" target="_XySaUKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XySaVasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XySaWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtOAtqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtOAt6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtOAuKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XySaVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XySaV6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XySaWKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wtVVdKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3JCDkIuQEeiu6boZkiJHCA" target="_wtVVcKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wtVVdaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtV8gaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XybkRKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3JCDkIuQEeiu6boZkiJHCA" target="_XybkQKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XybkRasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XybkSasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtVVdqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtVVd6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtV8gKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XybkRqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XybkR6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XybkSKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wtdRRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8oadYIuQEeiu6boZkiJHCA" target="_wtdRQKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wtdRRaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtdRSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XylVRKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_8oadYIuQEeiu6boZkiJHCA" target="_XylVQKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XylVRasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XylVSasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtdRRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtdRR6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtdRSKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XylVRqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XylVR6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XylVSKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wtnCRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DM_ksIuREeiu6boZkiJHCA" target="_wtnCQKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wtnCRaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtnCSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xyw7dKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DM_ksIuREeiu6boZkiJHCA" target="_Xyw7cKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xyw7dasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xyw7easnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtnCRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtnCR6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtnCSKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xyw7dqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xyw7d6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xyw7eKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wtu-FKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_G3oqcIuREeiu6boZkiJHCA" target="_wtu-EKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wtu-FaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wtu-GaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xy7ThKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_G3oqcIuREeiu6boZkiJHCA" target="_Xy7TgKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xy7ThasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xy76kqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wtu-FqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtu-F6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wtu-GKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xy7ThqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xy76kKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xy76kasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wt2S1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_W6DjoK1bEeiIjuV0HZnJAQ" target="_wt2S0KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wt2S1aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wt2S2aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XzGSpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_W6DjoK1bEeiIjuV0HZnJAQ" target="_XzGSoKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XzGSpasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzGSqasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wt2S1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wt2S16avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wt2S2KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XzGSpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XzGSp6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XzGSqKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wuBR8KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0G91jDBFEeam35bpdXJzEw" target="_wuAq4KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wuBR8aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuBR9aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XzkzwKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0G91jDBFEeam35bpdXJzEw" target="_XzjloKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XzkzwasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzkzxasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuBR8qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuBR86avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuBR9KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XzkzwqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xzkzw6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XzkzxKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wuvDp6avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0HHioDBFEeam35bpdXJzEw" target="_wuvDo6avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wuvDqKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wuvqsqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X3dONKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0HHioDBFEeam35bpdXJzEw" target="_X3dOMKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X3dONasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X3dOOasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuvDqaavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuvqsKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuvqsaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X3dONqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X3dON6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X3dOOKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wvUScaavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_S_bisIuREeiu6boZkiJHCA" target="_wvTrYKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wvUScqavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvUSdqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X5JQQKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_S_bisIuREeiu6boZkiJHCA" target="_X5IpMKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X5JQQasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5JQRasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wvUSc6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvUSdKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvUSdaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X5JQQqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5JQQ6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5JQRKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wvaZFKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ZFXmMIuREeiu6boZkiJHCA" target="_wvaZEKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wvaZFaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvaZGaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X5UPYasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ZFXmMIuREeiu6boZkiJHCA" target="_X5ToUKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X5UPYqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5UPZqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wvaZFqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvaZF6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvaZGKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X5UPY6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5UPZKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5UPZasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wvlYNKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0HHjqDBFEeam35bpdXJzEw" target="_wvlYMKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wvlYNaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wvlYOaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X51z0asnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0HHjqDBFEeam35bpdXJzEw" target="_X51MwKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X51z0qsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X51z1qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wvlYNqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvlYN6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wvlYOKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X51z06snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X51z1KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X51z1asnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wv3sEaavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_0HHlMDBFEeam35bpdXJzEw" target="_wv3FAKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wv3sEqavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wv3sFqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X648tKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0HHlMDBFEeam35bpdXJzEw" target="_X648sKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X648tasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X648uasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wv3sE6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wv3sFKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wv3sFaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X648tqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X648t6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X648uKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wwkPpKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_rwI9oPlIEeaQEoLj_Ia_cg" target="_wwkPoKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wwkPpaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wwkPqaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X9F8JKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_rwI9oPlIEeaQEoLj_Ia_cg" target="_X9F8IKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X9F8JasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X9F8KasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wwkPpqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wwkPp6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wwkPqKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X9F8JqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X9F8J6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X9F8KKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ww3xpKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BDPgIP4xEea_VPdGG2-szQ" target="_ww3xoKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ww3xpaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ww3xqaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X-MIUasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BDPgIP4xEea_VPdGG2-szQ" target="_X-LhQKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X-MIUqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X-MIVqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ww3xpqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ww3xp6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ww3xqKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X-MIU6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X-MIVKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X-MIVasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wxbLQKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__Y_BEIfVEeeirpBaj87qAw" target="_wxakMKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wxbLQaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wxbLRaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_X_0gBKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__Y_BEIfVEeeirpBaj87qAw" target="_X_0gAKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_X_0gBasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X_1HEKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wxbLQqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wxbLQ6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wxbLRKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X_0gBqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X_0gB6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X_0gCKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wyOchKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_wyOcgKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wyOchaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wyOciaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YBbChKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_YBbCgKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YBbChasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YBbCiasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wyOchqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wyOch6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wyOciKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YBbChqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YBbCh6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YBbCiKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wzFYJKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__j-OAK1aEeiIjuV0HZnJAQ" target="_wzFYIKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wzFYJaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wzFYKaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YDZ_gasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__j-OAK1aEeiIjuV0HZnJAQ" target="_YDZYcKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YDZ_gqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YDZ_hqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wzFYJqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wzFYJ6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wzFYKKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YDZ_g6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YDZ_hKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YDZ_hasnEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_9y8uwDBFEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="ConnectivityServiceSkeleton" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_BlU0MDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0MTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0MjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU0MzBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0NDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0NTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0NjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0NzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0ODBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0OTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0OjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0OzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0PDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0PTBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0PjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0PzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0QDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0QTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0QjBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0cDBGEeam35bpdXJzEw" x="-122" y="-3" width="160" height="63"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU0cTBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0cjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0czBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU0dDBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0dTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0djBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0dzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0eDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0eTBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0ejBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0ezBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0fDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0fTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0fjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0fzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0gDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0gTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0gjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0gzBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0sTBGEeam35bpdXJzEw" x="243" y="1" width="208" height="64"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU0sjBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0szBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0tDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU0tTBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0tjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0tzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0uDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0uTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0ujBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0uzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0vDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0vTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0vjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0vzBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0wDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0wTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0wjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0wzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0xDBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU08jBGEeam35bpdXJzEw" x="-159" y="288" height="67"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU1BDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1BTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1BjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU1BzBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1CDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1CTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1CjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1CzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1DDBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1DTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1DjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1DzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1EDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1ETBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1EjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1EzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1FDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1FTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1FjBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1RDBGEeam35bpdXJzEw" x="841" y="278" width="171" height="63"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU1WTBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1WjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1WzBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU1XDBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1XTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1XjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1XzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1YDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1YTBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1YjBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1YzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1ZDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1ZTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1ZjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1ZzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1aDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1aTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1ajBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1azBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1mTBGEeam35bpdXJzEw" x="158" y="284" width="255" height="62"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU16TBGEeam35bpdXJzEw" type="Interface_Shape">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1iHO4BMvEee0L_IMWjydgQ" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1iHO4RMvEee0L_IMWjydgQ" key="displayNameLabelIcon_value" value="true"/>
+    <children xsi:type="notation:Shape" xmi:id="_BlU0MDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0MTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0MjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU0MzBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0NDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0NTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0NjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0NzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0ODBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0OTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0OjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0OzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0PDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0PTBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0PjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0PzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0QDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0QTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0QjBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0cDBGEeam35bpdXJzEw" x="-122" y="-3" width="160" height="63"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU0cTBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0cjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0czBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU0dDBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0dTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0djBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0dzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0eDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0eTBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0ejBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0ezBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0fDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0fTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0fjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0fzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0gDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0gTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0gjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0gzBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0sTBGEeam35bpdXJzEw" x="243" y="1" width="208" height="64"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU0sjBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0szBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0tDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU0tTBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0tjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0tzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0uDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0uTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0ujBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0uzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0vDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0vTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0vjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0vzBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0wDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0wTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0wjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0wzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0xDBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU08jBGEeam35bpdXJzEw" x="-159" y="288" height="67"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU1BDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1BTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1BjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU1BzBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1CDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1CTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1CjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1CzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1DDBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1DTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1DjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1DzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1EDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1ETBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1EjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1EzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1FDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1FTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1FjBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1RDBGEeam35bpdXJzEw" x="841" y="278" width="171" height="63"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU1WTBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1WjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1WzBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU1XDBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1XTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1XjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1XzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1YDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1YTBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1YjBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1YzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1ZDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1ZTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1ZjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1ZzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1aDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1aTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1ajBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1azBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1mTBGEeam35bpdXJzEw" x="158" y="284" width="255" height="62"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU16TBGEeam35bpdXJzEw" type="Interface_Shape">
+      <eAnnotations xmi:id="_1iHO4BMvEee0L_IMWjydgQ" source="displayNameLabelIcon">
+        <details xmi:id="_1iHO4RMvEee0L_IMWjydgQ" key="displayNameLabelIcon_value" value="true"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU16jBGEeam35bpdXJzEw" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU16zBGEeam35bpdXJzEw" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU17DBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU17TBGEeam35bpdXJzEw" visible="false" type="Interface_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU17jBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU17zBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU18DBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU18TBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU18jBGEeam35bpdXJzEw" visible="false" type="Interface_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU18zBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU19DBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU19TBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU19jBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU19zBGEeam35bpdXJzEw" visible="false" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1-DBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1-TBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1-jBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1-zBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2ITBGEeam35bpdXJzEw" x="-158" y="-109" width="162" height="61"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU2QjBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2QzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2RDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU2RTBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2RjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2RzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2SDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2STBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2SjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2SzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2TDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2TTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2TjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2TzBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2UDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2UTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2UjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2UzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2VDBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2gjBGEeam35bpdXJzEw" x="203" y="169" width="129" height="49"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU2tzBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2uDBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2uTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU2ujBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2uzBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2vDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2vTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2vjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2vzBGEeam35bpdXJzEw"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU16jBGEeam35bpdXJzEw" type="Interface_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU16zBGEeam35bpdXJzEw" type="Interface_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU17DBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU17TBGEeam35bpdXJzEw" visible="false" type="Interface_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU17jBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU17zBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU18DBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU18TBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU18jBGEeam35bpdXJzEw" visible="false" type="Interface_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU18zBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU19DBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU19TBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU19jBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU19zBGEeam35bpdXJzEw" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1-DBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1-TBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1-jBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1-zBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2ITBGEeam35bpdXJzEw" x="-158" y="-109" width="162" height="61"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU2QjBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2QzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2RDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU2RTBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2RjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2RzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2SDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2STBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2SjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2SzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2TDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2TTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2TjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2TzBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2UDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2UTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2UjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2UzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2VDBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2gjBGEeam35bpdXJzEw" x="203" y="169" width="129" height="49"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_BlU2tzBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2uDBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2uTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU2ujBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2uzBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2vDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2vTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2vjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2vzBGEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2wDBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2wTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2wjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2wzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2xDBGEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2wDBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2wTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2wjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2wzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2xDBGEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2xTBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2xjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2xzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2yDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2yTBGEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2xTBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2xjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2xzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2yDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2yTBGEeam35bpdXJzEw"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU29zBGEeam35bpdXJzEw" x="148" y="425" width="164" height="62"/>
+      <element href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU29zBGEeam35bpdXJzEw" x="148" y="425" width="164" height="62"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU3KDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3KTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU3KjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU3KzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU3LDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU3LTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3LjBGEeam35bpdXJzEw"/>
+    <children xsi:type="notation:Shape" xmi:id="_BlU3KDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3KTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU3KjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU3KzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU3LDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU3LTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3LjBGEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU3LzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU3MDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU3MTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU3MjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3MzBGEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU3LzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU3MDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU3MTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU3MjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3MzBGEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU3NDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU3NTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU3NjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU3NzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3ODBGEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU3NDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU3NTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU3NjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU3NzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3ODBGEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3OTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU3OjBGEeam35bpdXJzEw" y="5"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3OTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU3OjBGEeam35bpdXJzEw" y="5"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3aDBGEeam35bpdXJzEw" x="843" y="82" width="167" height="58"/>
+      <element href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3aDBGEeam35bpdXJzEw" x="843" y="82" width="167" height="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlU3yjBGEeam35bpdXJzEw" type="Constraint_PackagedElementShape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3yzBGEeam35bpdXJzEw" type="Constraint_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3zDBGEeam35bpdXJzEw" type="Constraint_BodyLabel"/>
-      <element xmi:type="uml:Constraint" href="TapiConnectivity.uml#_CIxSkLrhEeWYrqoqXLgguw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU33zBGEeam35bpdXJzEw" x="72" y="-100" width="275" height="46"/>
+    <children xsi:type="notation:Shape" xmi:id="_BlU3yjBGEeam35bpdXJzEw" type="Constraint_PackagedElementShape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3yzBGEeam35bpdXJzEw" type="Constraint_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3zDBGEeam35bpdXJzEw" type="Constraint_BodyLabel"/>
+      <element href="TapiConnectivity.uml#_CIxSkLrhEeWYrqoqXLgguw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU33zBGEeam35bpdXJzEw" x="72" y="-100" width="275" height="46"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BlxgSDBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BlxgSTBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BlxgSzBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_BlxgSDBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BlxgSTBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BlxgSzBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlxgSjBGEeam35bpdXJzEw" x="846" y="232"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlxgSjBGEeam35bpdXJzEw" x="846" y="232"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Bl7RKjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Bl7RKzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bl7RLTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Bl7RKjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Bl7RKzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Bl7RLTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bl7RLDBGEeam35bpdXJzEw" x="571" y="367"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Bl7RLDBGEeam35bpdXJzEw" x="571" y="367"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BmEbGjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BmEbGzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmEbHTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
+    <children xsi:type="notation:Shape" xmi:id="_BmEbGjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BmEbGzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmEbHTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmEbHDBGEeam35bpdXJzEw" x="1057" y="506"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmEbHDBGEeam35bpdXJzEw" x="1057" y="506"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BmEbMDBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BmEbMTBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmEbMzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BmEbMDBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BmEbMTBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmEbMzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmEbMjBGEeam35bpdXJzEw" x="1057" y="506"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmEbMjBGEeam35bpdXJzEw" x="1057" y="506"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BmEbRjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BmEbRzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmEbSTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
+    <children xsi:type="notation:Shape" xmi:id="_BmEbRjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BmEbRzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmEbSTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmEbSDBGEeam35bpdXJzEw" x="1057" y="506"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmEbSDBGEeam35bpdXJzEw" x="1057" y="506"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BmhHCjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BmhHCzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmhHDTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
+    <children xsi:type="notation:Shape" xmi:id="_BmhHCjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BmhHCzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmhHDTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmhHDDBGEeam35bpdXJzEw" x="834" y="508"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmhHDDBGEeam35bpdXJzEw" x="834" y="508"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BmhHIDBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BmhHITBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmhHIzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BmhHIDBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BmhHITBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmhHIzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmhHIjBGEeam35bpdXJzEw" x="834" y="508"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmhHIjBGEeam35bpdXJzEw" x="834" y="508"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Bn3K2jBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Bn3K2zBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bn3K3TBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_Bn3K2jBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Bn3K2zBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Bn3K3TBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bn3K3DBGEeam35bpdXJzEw" x="1073" y="369"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Bn3K3DBGEeam35bpdXJzEw" x="1073" y="369"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_bkhPpjI_EeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_bkhPpzI_EeamvfKYyWmELQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bkhPqTI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_bkhPpjI_EeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bkhPpzI_EeamvfKYyWmELQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bkhPqTI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bkhPqDI_EeamvfKYyWmELQ" x="846" y="232"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bkhPqDI_EeamvfKYyWmELQ" x="846" y="232"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_IFaY4zK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IFaY5DK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IFaY5jK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_IFaY4zK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IFaY5DK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IFaY5jK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IFaY5TK-EeaULOmJRJKM0Q" x="846" y="232"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IFaY5TK-EeaULOmJRJKM0Q" x="846" y="232"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MTUjxjK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTUjxzK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MTUjyTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_MTUjxjK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_MTUjxzK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_MTUjyTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTUjyDK-EeaULOmJRJKM0Q" x="846" y="232"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MTUjyDK-EeaULOmJRJKM0Q" x="846" y="232"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_NkS0QDM-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_NkS0QTM-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NkS0QzM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_NkS0QDM-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_NkS0QTM-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_NkS0QzM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NkS0QjM-EeaULOmJRJKM0Q" x="846" y="232"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NkS0QjM-EeaULOmJRJKM0Q" x="846" y="232"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_D3_4oDM_EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3_4oTM_EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3_4ozM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_D3_4oDM_EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_D3_4oTM_EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_D3_4ozM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3_4ojM_EeaULOmJRJKM0Q" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_D3_4ojM_EeaULOmJRJKM0Q" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_TOrSfzNAEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TOrSgDNAEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TOrSgjNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_TOrSfzNAEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_TOrSgDNAEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_TOrSgjNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TOrSgTNAEeaULOmJRJKM0Q" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TOrSgTNAEeaULOmJRJKM0Q" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_VCDFpjNGEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_VCDFpzNGEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VCDFqTNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_VCDFpjNGEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_VCDFpzNGEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VCDFqTNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VCDFqDNGEeaULOmJRJKM0Q" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VCDFqDNGEeaULOmJRJKM0Q" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4F8a5jN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4F8a5zN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4F8a6TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_4F8a5jN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_4F8a5zN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4F8a6TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8a6DN4Eea0Br-ajMxp_A" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4F8a6DN4Eea0Br-ajMxp_A" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4F8bADN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4F8bATN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4F8bAzN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_4F8bADN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_4F8bATN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4F8bAzN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8bAjN4Eea0Br-ajMxp_A" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4F8bAjN4Eea0Br-ajMxp_A" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_AOC3IDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_AOC3ITOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AOC3IzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_AOC3IDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_AOC3ITOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_AOC3IzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AOC3IjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_AOC3IjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BAFYEDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYETOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BAFYEDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYETOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYEjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYEjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BAFYJDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYJTOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYJzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BAFYJDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYJTOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYJzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYJjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYJjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BBa09DOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa09TOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa09zOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BBa09DOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa09TOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa09zOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa09jOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa09jOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_BBa1CDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa1CTOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa1CzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_BBa1CDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa1CTOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa1CzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa1CjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa1CjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_U2ErEzOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_U2ErFDOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_U2ErFjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_U2ErEzOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_U2ErFDOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_U2ErFjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U2ErFTOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_U2ErFTOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_tdP0dj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_tdP0dz4ZEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tdP0eT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_tdP0dj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_tdP0dz4ZEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_tdP0eT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tdP0eD4ZEea-1_BGg-qcjQ" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tdP0eD4ZEea-1_BGg-qcjQ" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZzBLxz4hEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ZzBLyD4hEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZzBLyj4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_ZzBLxz4hEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ZzBLyD4hEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZzBLyj4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZzBLyT4hEea-1_BGg-qcjQ" x="641" y="233"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZzBLyT4hEea-1_BGg-qcjQ" x="641" y="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_LHsC7z4lEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_LHsC8D4lEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LHsC8j4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_LHsC7z4lEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_LHsC8D4lEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LHsC8j4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LHsC8T4lEea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LHsC8T4lEea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_avd88z4yEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_avd89D4yEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_avd89j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_avd88z4yEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_avd89D4yEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_avd89j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_avd89T4yEea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_avd89T4yEea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_nd0pdj4zEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_nd0pdz4zEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nd0peT4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_nd0pdj4zEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_nd0pdz4zEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nd0peT4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nd0peD4zEea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nd0peD4zEea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_c1YZdT41Eea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_c1YZdj41Eea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_c1YZeD41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_c1YZdT41Eea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c1YZdj41Eea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c1YZeD41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c1YZdz41Eea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c1YZdz41Eea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_YrxvlETYEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_YrxvlUTYEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Yrxvl0TYEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_YrxvlETYEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YrxvlUTYEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Yrxvl0TYEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YrxvlkTYEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YrxvlkTYEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_33ZW40TbEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_33ZW5ETbEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_33ZW5kTbEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_33ZW40TbEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_33ZW5ETbEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_33ZW5kTbEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_33ZW5UTbEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_33ZW5UTbEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Ykm-fETdEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Ykm-fUTdEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ykm-f0TdEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_Ykm-fETdEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Ykm-fUTdEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ykm-f0TdEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ykm-fkTdEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ykm-fkTdEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hIsCB0TpEead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hIsCCETpEead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hIsCCkTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_hIsCB0TpEead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hIsCCETpEead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hIsCCkTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hIsCCUTpEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hIsCCUTpEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_vwkllkT2Eead1bezhJG4aw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_vwkll0T2Eead1bezhJG4aw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vwklmUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_vwkllkT2Eead1bezhJG4aw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_vwkll0T2Eead1bezhJG4aw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vwklmUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vwklmET2Eead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vwklmET2Eead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2EMlsEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2EMlsUXCEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2EMls0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_2EMlsEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_2EMlsUXCEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2EMls0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2EMlskXCEeaB8vMnkFQLXQ" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2EMlskXCEeaB8vMnkFQLXQ" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_fPyRY0XQEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fPyRZEXQEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fPyRZkXQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_fPyRY0XQEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_fPyRZEXQEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fPyRZkXQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fPyRZUXQEeaB8vMnkFQLXQ" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fPyRZUXQEeaB8vMnkFQLXQ" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_5UJooEzyEeabHNlo0UKXdA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_5UJooUzyEeabHNlo0UKXdA" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5UJoo0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_5UJooEzyEeabHNlo0UKXdA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_5UJooUzyEeabHNlo0UKXdA" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_5UJoo0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5UJookzyEeabHNlo0UKXdA" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5UJookzyEeabHNlo0UKXdA" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_N2n6Hk0LEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_N2n6H00LEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N2xrEE0LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_N2n6Hk0LEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_N2n6H00LEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_N2xrEE0LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N2n6IE0LEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_N2n6IE0LEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_GjIzcE0NEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_GjIzcU0NEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GjIzc00NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_GjIzcE0NEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_GjIzcU0NEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_GjIzc00NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GjIzck0NEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GjIzck0NEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_fADZIE0OEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fADZIU0OEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fADZI00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_fADZIE0OEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_fADZIU0OEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fADZI00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fADZIk0OEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fADZIk0OEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_SDWYh00WEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_SDWYiE0WEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SDWYik0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_SDWYh00WEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_SDWYiE0WEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SDWYik0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SDWYiU0WEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SDWYiU0WEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_HUhopE0XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_HUhopU0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HUhop00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_HUhopE0XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HUhopU0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUhop00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhopk0XEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUhopk0XEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_VcisWE0XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_VcisWU0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VcisW00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_VcisWE0XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_VcisWU0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VcisW00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VcisWk0XEeaqn4OIuRCwEg" x="482" y="33"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VcisWk0XEeaqn4OIuRCwEg" x="482" y="33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mgcctE0YEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mgcctU0YEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mgcct00YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_mgcctE0YEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_mgcctU0YEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_mgcct00YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgcctk0YEeaqn4OIuRCwEg" x="482" y="33"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mgcctk0YEeaqn4OIuRCwEg" x="482" y="33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_65dnQHTwEeaoHe3mKsYq3Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_65dnQXTwEeaoHe3mKsYq3Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_65dnQ3TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_65dnQHTwEeaoHe3mKsYq3Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_65dnQXTwEeaoHe3mKsYq3Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_65dnQ3TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_65dnQnTwEeaoHe3mKsYq3Q" x="482" y="33"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_65dnQnTwEeaoHe3mKsYq3Q" x="482" y="33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZVIJs3rqEeavcODnuX7FyA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ZVIJtHrqEeavcODnuX7FyA" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZVIJtnrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_ZVIJs3rqEeavcODnuX7FyA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ZVIJtHrqEeavcODnuX7FyA" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZVIJtnrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVIJtXrqEeavcODnuX7FyA" x="478" y="49"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZVIJtXrqEeavcODnuX7FyA" x="478" y="49"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_b9UxE8FhEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_b9UxFMFhEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_b9UxFsFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_b9UxE8FhEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_b9UxFMFhEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b9UxFsFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9UxFcFhEeaALJQAf08uAg" x="478" y="49"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_b9UxFcFhEeaALJQAf08uAg" x="478" y="49"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_aP1fE8FiEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_aP1fFMFiEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aP1fFsFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_aP1fE8FiEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_aP1fFMFiEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aP1fFsFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aP1fFcFiEeaALJQAf08uAg" x="478" y="49"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aP1fFcFiEeaALJQAf08uAg" x="478" y="49"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qeeMtsFpEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qeeMt8FpEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qeeMucFpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_qeeMtsFpEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_qeeMt8FpEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_qeeMucFpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qeeMuMFpEeaALJQAf08uAg" x="477" y="-89"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_qeeMuMFpEeaALJQAf08uAg" x="477" y="-89"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_aBpSQ8GHEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_aBpSRMGHEeaALJQAf08uAg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aBpSRsGHEeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_aBpSQ8GHEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_aBpSRMGHEeaALJQAf08uAg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aBpSRsGHEeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aBpSRcGHEeaALJQAf08uAg" x="470" y="158"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aBpSRcGHEeaALJQAf08uAg" x="470" y="158"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_e4LtYMhsEeaVlemTikmRHw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_e4LtYshsEeaVlemTikmRHw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_e4LtY8hsEeaVlemTikmRHw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e4LtZMhsEeaVlemTikmRHw" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_e4LtYMhsEeaVlemTikmRHw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_e4LtYshsEeaVlemTikmRHw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_e4LtY8hsEeaVlemTikmRHw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_e4LtZMhsEeaVlemTikmRHw" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_e4LtZchsEeaVlemTikmRHw" visible="false" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_J-wK8shtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_l5X4NMhsEeaVlemTikmRHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_J-wK88htEeaVlemTikmRHw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_e4LtZchsEeaVlemTikmRHw" visible="false" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_J-wK8shtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_l5X4NMhsEeaVlemTikmRHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_J-wK88htEeaVlemTikmRHw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_J-wK9MhtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_mvBt1MhsEeaVlemTikmRHw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_J-wK9chtEeaVlemTikmRHw"/>
+        <children xsi:type="notation:Shape" xmi:id="_J-wK9MhtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_mvBt1MhsEeaVlemTikmRHw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_J-wK9chtEeaVlemTikmRHw"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_e4LtZshsEeaVlemTikmRHw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_e4LtZ8hsEeaVlemTikmRHw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_e4LtaMhsEeaVlemTikmRHw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4LtachsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_e4LtZshsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_e4LtZ8hsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_e4LtaMhsEeaVlemTikmRHw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4LtachsEeaVlemTikmRHw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_e4LtashsEeaVlemTikmRHw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_e4Lta8hsEeaVlemTikmRHw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_e4LtbMhsEeaVlemTikmRHw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_e4LtbchsEeaVlemTikmRHw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4LtbshsEeaVlemTikmRHw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_e4LtashsEeaVlemTikmRHw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_e4Lta8hsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_e4LtbMhsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_e4LtbchsEeaVlemTikmRHw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4LtbshsEeaVlemTikmRHw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_e4Ltb8hsEeaVlemTikmRHw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_e4LtcMhsEeaVlemTikmRHw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_e4LtcchsEeaVlemTikmRHw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_e4LtcshsEeaVlemTikmRHw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4Ltc8hsEeaVlemTikmRHw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_e4Ltb8hsEeaVlemTikmRHw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_e4LtcMhsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_e4LtcchsEeaVlemTikmRHw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_e4LtcshsEeaVlemTikmRHw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4Ltc8hsEeaVlemTikmRHw"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4LtYchsEeaVlemTikmRHw" x="13" y="-246" width="408" height="68"/>
+      <element href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4LtYchsEeaVlemTikmRHw" x="13" y="-246" width="408" height="68"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_zwoew_lHEeaQEoLj_Ia_cg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_zwoexPlHEeaQEoLj_Ia_cg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zwoexvlHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_zwoew_lHEeaQEoLj_Ia_cg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_zwoexPlHEeaQEoLj_Ia_cg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_zwoexvlHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwoexflHEeaQEoLj_Ia_cg" x="45" y="-223"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_zwoexflHEeaQEoLj_Ia_cg" x="45" y="-223"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_9anQwPlHEeaQEoLj_Ia_cg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9anQwflHEeaQEoLj_Ia_cg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9anQw_lHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_9anQwPlHEeaQEoLj_Ia_cg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_9anQwflHEeaQEoLj_Ia_cg" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_9anQw_lHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9anQwvlHEeaQEoLj_Ia_cg" x="45" y="-223"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9anQwvlHEeaQEoLj_Ia_cg" x="45" y="-223"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_luMgoBMjEee0L_IMWjydgQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_luMgohMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_luMgoxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_luMgpBMjEee0L_IMWjydgQ" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_luMgoBMjEee0L_IMWjydgQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_luMgohMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_luMgoxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_luMgpBMjEee0L_IMWjydgQ" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_luMgpRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_luMgphMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_luMgpxMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_luMgqBMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgqRMjEee0L_IMWjydgQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_luMgpRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_luMgphMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_luMgpxMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_luMgqBMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgqRMjEee0L_IMWjydgQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_luMgqhMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_luMgqxMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_luMgrBMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_luMgrRMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgrhMjEee0L_IMWjydgQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_luMgqhMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_luMgqxMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_luMgrBMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_luMgrRMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgrhMjEee0L_IMWjydgQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_luMgrxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_luMgsBMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_luMgsRMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_luMgshMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgsxMjEee0L_IMWjydgQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgoRMjEee0L_IMWjydgQ" x="618" y="78" width="157" height="59"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_luMgrxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_luMgsBMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_luMgsRMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_luMgshMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgsxMjEee0L_IMWjydgQ"/>
+      </children>
+      <element href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgoRMjEee0L_IMWjydgQ" x="618" y="78" width="157" height="59"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_6_LyABMjEee0L_IMWjydgQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_6_LyAhMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_6_LyAxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6_LyBBMjEee0L_IMWjydgQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_6_LyBRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_6_LyBhMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_6_LyBxMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6_LyCBMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyCRMjEee0L_IMWjydgQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_6_LyChMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_6_LyCxMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_6_LyDBMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6_LyDRMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyDhMjEee0L_IMWjydgQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_6_LyDxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_6_LyEBMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_6_LyERMjEee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6_LyEhMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyExMjEee0L_IMWjydgQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyARMjEee0L_IMWjydgQ" x="837" y="-92" width="185" height="59"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_GbpwIBM2Eee0L_IMWjydgQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_GbpwIhM2Eee0L_IMWjydgQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GbpwIxM2Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GbpwJBM2Eee0L_IMWjydgQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_GbpwJRM2Eee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_GbpwJhM2Eee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_GbpwJxM2Eee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GbpwKBM2Eee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwKRM2Eee0L_IMWjydgQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_GbpwKhM2Eee0L_IMWjydgQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_GbpwKxM2Eee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_GbpwLBM2Eee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GbpwLRM2Eee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwLhM2Eee0L_IMWjydgQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_GbpwLxM2Eee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_GbpwMBM2Eee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_GbpwMRM2Eee0L_IMWjydgQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GbpwMhM2Eee0L_IMWjydgQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwMxM2Eee0L_IMWjydgQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwIRM2Eee0L_IMWjydgQ" x="549" y="-249" width="133" height="73"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_0AIzM2JqEeek3OrhDuslYQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0AJaQGJqEeek3OrhDuslYQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0AJaQmJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <children xsi:type="notation:Shape" xmi:id="_6_LyABMjEee0L_IMWjydgQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_6_LyAhMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_6_LyAxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_6_LyBBMjEee0L_IMWjydgQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6_LyBRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_6_LyBhMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_6_LyBxMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_6_LyCBMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyCRMjEee0L_IMWjydgQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6_LyChMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_6_LyCxMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_6_LyDBMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_6_LyDRMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyDhMjEee0L_IMWjydgQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6_LyDxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_6_LyEBMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_6_LyERMjEee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_6_LyEhMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyExMjEee0L_IMWjydgQ"/>
+      </children>
+      <element href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyARMjEee0L_IMWjydgQ" x="837" y="-92" width="185" height="59"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_GbpwIBM2Eee0L_IMWjydgQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_GbpwIhM2Eee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_GbpwIxM2Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_GbpwJBM2Eee0L_IMWjydgQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_GbpwJRM2Eee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_GbpwJhM2Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_GbpwJxM2Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_GbpwKBM2Eee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwKRM2Eee0L_IMWjydgQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_GbpwKhM2Eee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_GbpwKxM2Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_GbpwLBM2Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_GbpwLRM2Eee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwLhM2Eee0L_IMWjydgQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_GbpwLxM2Eee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_GbpwMBM2Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_GbpwMRM2Eee0L_IMWjydgQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_GbpwMhM2Eee0L_IMWjydgQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwMxM2Eee0L_IMWjydgQ"/>
+      </children>
+      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwIRM2Eee0L_IMWjydgQ" x="549" y="-249" width="133" height="73"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_0AIzM2JqEeek3OrhDuslYQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_0AJaQGJqEeek3OrhDuslYQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0AJaQmJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0AJaQWJqEeek3OrhDuslYQ" x="871" y="184"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0AJaQWJqEeek3OrhDuslYQ" x="871" y="184"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_IC8_M2NFEee0bPnI-Gt-mQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IC8_NGNFEee0bPnI-Gt-mQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IC8_NmNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_IC8_M2NFEee0bPnI-Gt-mQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IC8_NGNFEee0bPnI-Gt-mQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IC8_NmNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IC8_NWNFEee0bPnI-Gt-mQ" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IC8_NWNFEee0bPnI-Gt-mQ" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_IEdbEGNFEee0bPnI-Gt-mQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IEdbEWNFEee0bPnI-Gt-mQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IEdbE2NFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_IEdbEGNFEee0bPnI-Gt-mQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IEdbEWNFEee0bPnI-Gt-mQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEdbE2NFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IEdbEmNFEee0bPnI-Gt-mQ" x="753" y="-212"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEdbEmNFEee0bPnI-Gt-mQ" x="753" y="-212"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1ZxusHIYEeeSiaQ95-6r9w" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_1ZyVwHIYEeeSiaQ95-6r9w" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_1ZyVwXIYEeeSiaQ95-6r9w" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1ZyVwnIYEeeSiaQ95-6r9w" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_1ZxusHIYEeeSiaQ95-6r9w" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ZyVwHIYEeeSiaQ95-6r9w" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_1ZyVwXIYEeeSiaQ95-6r9w" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ZyVwnIYEeeSiaQ95-6r9w" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_1ZyVw3IYEeeSiaQ95-6r9w" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_1ZyVxHIYEeeSiaQ95-6r9w"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_1ZyVxXIYEeeSiaQ95-6r9w"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1ZyVxnIYEeeSiaQ95-6r9w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZyVx3IYEeeSiaQ95-6r9w"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_1ZyVw3IYEeeSiaQ95-6r9w" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_1ZyVxHIYEeeSiaQ95-6r9w"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_1ZyVxXIYEeeSiaQ95-6r9w"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_1ZyVxnIYEeeSiaQ95-6r9w"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZyVx3IYEeeSiaQ95-6r9w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_1Zy80HIYEeeSiaQ95-6r9w" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_1Zy80XIYEeeSiaQ95-6r9w"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_1Zy80nIYEeeSiaQ95-6r9w"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zy803IYEeeSiaQ95-6r9w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Zy81HIYEeeSiaQ95-6r9w"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_1Zy80HIYEeeSiaQ95-6r9w" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_1Zy80XIYEeeSiaQ95-6r9w"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_1Zy80nIYEeeSiaQ95-6r9w"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_1Zy803IYEeeSiaQ95-6r9w"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1Zy81HIYEeeSiaQ95-6r9w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_1Zy81XIYEeeSiaQ95-6r9w" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_1Zy81nIYEeeSiaQ95-6r9w"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_1Zy813IYEeeSiaQ95-6r9w"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zy82HIYEeeSiaQ95-6r9w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Zy82XIYEeeSiaQ95-6r9w"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_1Zy81XIYEeeSiaQ95-6r9w" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_1Zy81nIYEeeSiaQ95-6r9w"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_1Zy813IYEeeSiaQ95-6r9w"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_1Zy82HIYEeeSiaQ95-6r9w"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1Zy82XIYEeeSiaQ95-6r9w"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZxusXIYEeeSiaQ95-6r9w" x="571" y="290" width="115" height="56"/>
+      <element href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZxusXIYEeeSiaQ95-6r9w" x="571" y="290" width="115" height="56"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3YdyUKLTEeeG6K0eZHmVww" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_3Ym8QKLTEeeG6K0eZHmVww" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3Ym8QaLTEeeG6K0eZHmVww" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3Ym8QqLTEeeG6K0eZHmVww" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_3YdyUKLTEeeG6K0eZHmVww" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_3Ym8QKLTEeeG6K0eZHmVww" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_3Ym8QaLTEeeG6K0eZHmVww" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_3Ym8QqLTEeeG6K0eZHmVww" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_3YnjUKLTEeeG6K0eZHmVww" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_3YnjUaLTEeeG6K0eZHmVww"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_3YnjUqLTEeeG6K0eZHmVww"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_3YnjU6LTEeeG6K0eZHmVww"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YnjVKLTEeeG6K0eZHmVww"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_3YnjUKLTEeeG6K0eZHmVww" visible="false" type="Class_AttributeCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_3YnjUaLTEeeG6K0eZHmVww"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_3YnjUqLTEeeG6K0eZHmVww"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_3YnjU6LTEeeG6K0eZHmVww"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YnjVKLTEeeG6K0eZHmVww"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_3YnjVaLTEeeG6K0eZHmVww" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_3YnjVqLTEeeG6K0eZHmVww"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_3YnjV6LTEeeG6K0eZHmVww"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_3YnjWKLTEeeG6K0eZHmVww"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YnjWaLTEeeG6K0eZHmVww"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_3YnjVaLTEeeG6K0eZHmVww" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_3YnjVqLTEeeG6K0eZHmVww"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_3YnjV6LTEeeG6K0eZHmVww"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_3YnjWKLTEeeG6K0eZHmVww"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YnjWaLTEeeG6K0eZHmVww"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_3YnjWqLTEeeG6K0eZHmVww" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_3YnjW6LTEeeG6K0eZHmVww"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_3YnjXKLTEeeG6K0eZHmVww"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_3YnjXaLTEeeG6K0eZHmVww"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YnjXqLTEeeG6K0eZHmVww"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_3YnjWqLTEeeG6K0eZHmVww" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_3YnjW6LTEeeG6K0eZHmVww"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_3YnjXKLTEeeG6K0eZHmVww"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_3YnjXaLTEeeG6K0eZHmVww"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YnjXqLTEeeG6K0eZHmVww"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YdyUaLTEeeG6K0eZHmVww" x="834" y="-253" width="206" height="64"/>
+      <element href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YdyUaLTEeeG6K0eZHmVww" x="834" y="-253" width="206" height="64"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wheqw6avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wheqxKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wheqxqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <children xsi:type="notation:Shape" xmi:id="_XcgXkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XcgXkasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XcgXk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wheqxaavEeqJcvXkREZ1XQ" x="78" y="-3"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XcgXkqsnEeqiJu55eR3W2w" x="78" y="-3"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_whl_gKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_whl_gaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whl_g6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xc5ZIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xc5ZIasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xc5ZI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_whl_gqavEeqJcvXkREZ1XQ" x="78" y="-103"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xc5ZIqsnEeqiJu55eR3W2w" x="78" y="-103"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_whxlsKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_whxlsaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whxls6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XdGNcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XdGNcasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdGNc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_whxlsqavEeqJcvXkREZ1XQ" x="78" y="-103"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XdGNcqsnEeqiJu55eR3W2w" x="78" y="-103"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wiLOUKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wiLOUaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiLOU6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <children xsi:type="notation:Shape" xmi:id="_XdpnEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XdpnEasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdpnE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wiLOUqavEeqJcvXkREZ1XQ" x="443" y="1"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XdpnEqsnEeqiJu55eR3W2w" x="443" y="1"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wiWNcKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wiWNcaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiWNc6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XeCBkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XeCBkasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XeCBk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wiWNcqavEeqJcvXkREZ1XQ" x="443" y="-99"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XeCBkqsnEeqiJu55eR3W2w" x="443" y="-99"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_widiMKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_widiMaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_widiM6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_XePc8KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XePc8asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XePc86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_widiMqavEeqJcvXkREZ1XQ" x="443" y="-99"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XePc8qsnEeqiJu55eR3W2w" x="443" y="-99"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wiqWgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wiqWgaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiqWg6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xe4WIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xe4WIasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xe49MKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wiqWgqavEeqJcvXkREZ1XQ" x="41" y="288"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xe4WIqsnEeqiJu55eR3W2w" x="41" y="288"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wi3K0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wi3K0aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wi3K06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XfokEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XfokEasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XfokE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wi3K0qavEeqJcvXkREZ1XQ" x="1041" y="278"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XfokEqsnEeqiJu55eR3W2w" x="1041" y="278"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wjKFwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wjKFwaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjKFw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xsi:type="notation:Shape" xmi:id="_XgW80KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XgW80asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XgW806snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjKFwqavEeqJcvXkREZ1XQ" x="358" y="284"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XgW80qsnEeqiJu55eR3W2w" x="358" y="284"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wjZWUKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wjZWUaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjZWU6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xg36MKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xg36MasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xg36M6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjZWUqavEeqJcvXkREZ1XQ" x="42" y="-109"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xg36MqsnEeqiJu55eR3W2w" x="42" y="-109"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wjigQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wjigQaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjigQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XhZeoKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XhZeoasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XhZeo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjigQqavEeqJcvXkREZ1XQ" x="403" y="169"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XhZeoqsnEeqiJu55eR3W2w" x="403" y="169"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wjs4U6avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wjs4VKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjs4VqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xh7qIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xh7qIasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xh7qI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wjs4VaavEeqJcvXkREZ1XQ" x="348" y="425"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xh7qIqsnEeqiJu55eR3W2w" x="348" y="425"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wj3QYKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wj3QYaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj3QY6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XicngKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XicngasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xicng6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wj3QYqavEeqJcvXkREZ1XQ" x="1043" y="82"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XicngqsnEeqiJu55eR3W2w" x="1043" y="82"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wj9-EKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wj9-EaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj9-E6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xiu7YKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xiu7YasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xiu7Y6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wj9-EqavEeqJcvXkREZ1XQ" x="1043" y="-18"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xiu7YqsnEeqiJu55eR3W2w" x="1043" y="-18"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wkHIAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wkHIAaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkHIA6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xi5TcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xi5TcasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xi5Tc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkHIAqavEeqJcvXkREZ1XQ" x="1043" y="-18"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xi5TcqsnEeqiJu55eR3W2w" x="1043" y="-18"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wkSHIKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wkSHIaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkSHI6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XjV_YKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XjV_YasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjWmcKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkSHIqavEeqJcvXkREZ1XQ" x="213" y="-246"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XjV_YqsnEeqiJu55eR3W2w" x="213" y="-246"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wkYNwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wkYNwaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkYNw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XjmeEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XjmeEasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjmeE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkYNwqavEeqJcvXkREZ1XQ" x="213" y="-346"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XjmeEqsnEeqiJu55eR3W2w" x="213" y="-346"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wkdGQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wkdGQaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkdGQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XjvoAKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XjvoAasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjwPEKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkdGQqavEeqJcvXkREZ1XQ" x="213" y="-346"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XjvoAqsnEeqiJu55eR3W2w" x="213" y="-346"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wkil0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wkil0aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkil06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xj6nIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xj6nIasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xj6nI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wkil0qavEeqJcvXkREZ1XQ" x="213" y="-346"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xj6nIqsnEeqiJu55eR3W2w" x="213" y="-346"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wksW06avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wksW1KavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wksW1qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XkX6IKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XkX6IasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XkX6I6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wksW1aavEeqJcvXkREZ1XQ" x="818" y="78"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XkX6IqsnEeqiJu55eR3W2w" x="818" y="78"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wk4kEKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wk4kEaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk4kE6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XlDPkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XlDPkasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlDPk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wk4kEqavEeqJcvXkREZ1XQ" x="1037" y="-92"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XlDPkqsnEeqiJu55eR3W2w" x="1037" y="-92"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wk_RwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wk_RwaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk_Rw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XlVjcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XlVjcasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlVjc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wk_RwqavEeqJcvXkREZ1XQ" x="1037" y="-192"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XlVjcqsnEeqiJu55eR3W2w" x="1037" y="-192"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wlGmgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wlGmgaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlGmg6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+    <children xsi:type="notation:Shape" xmi:id="_Xlf7gKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Xlf7gasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xlf7g6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlGmgqavEeqJcvXkREZ1XQ" x="1037" y="-192"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xlf7gqsnEeqiJu55eR3W2w" x="1037" y="-192"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wlSzwKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wlSzwaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlSzw6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XmSlsKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XmSlsasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XmSls6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlSzwqavEeqJcvXkREZ1XQ" x="749" y="-249"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XmSlsqsnEeqiJu55eR3W2w" x="749" y="-249"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wldy4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wldy4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wldy46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
+    <children xsi:type="notation:Shape" xmi:id="_XnA-cKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XnA-casnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnA-c6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wldy4qavEeqJcvXkREZ1XQ" x="771" y="290"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnA-cqsnEeqiJu55eR3W2w" x="771" y="290"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wlj5gKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wlj5gaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlj5g6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
+    <children xsi:type="notation:Shape" xmi:id="_XnQ2EKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XnQ2EasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnQ2E6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlj5gqavEeqJcvXkREZ1XQ" x="771" y="190"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnQ2EqsnEeqiJu55eR3W2w" x="771" y="190"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wlnj4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wlnj4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlnj46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
+    <children xsi:type="notation:Shape" xmi:id="_XnXjwKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XnXjwasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnXjw6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlnj4qavEeqJcvXkREZ1XQ" x="771" y="190"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnXjwqsnEeqiJu55eR3W2w" x="771" y="190"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wlzKE6avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wlzKFKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlzKFqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XnxzcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XnxzcasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xnxzc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wlzKFaavEeqJcvXkREZ1XQ" x="1034" y="-253"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnxzcqsnEeqiJu55eR3W2w" x="1034" y="-253"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wl6e0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wl6e0aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl6e06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_XoAc8KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XoAc8asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoAc86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wl6e0qavEeqJcvXkREZ1XQ" x="1034" y="-353"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XoAc8qsnEeqiJu55eR3W2w" x="1034" y="-353"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wl_XUKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wl_XUaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl_XU6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
+    <children xsi:type="notation:Shape" xmi:id="_XoIYwKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_XoIYwasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoIYw6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wl_XUqavEeqJcvXkREZ1XQ" x="1034" y="-353"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XoIYwqsnEeqiJu55eR3W2w" x="1034" y="-353"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_9y8uwTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_9y8uwjBFEeam35bpdXJzEw"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GGEkQIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_9y8uwTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_9y8uwjBFEeam35bpdXJzEw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_GGEkQIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_BlU3IzBGEeam35bpdXJzEw" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_KvwS4IuOEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_BlU3JDBGEeam35bpdXJzEw"/>
+    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_BlU3IzBGEeam35bpdXJzEw" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_KvwS4IuOEeiu6boZkiJHCA">
+      <styles xsi:type="notation:FontStyle" xmi:id="_BlU3JDBGEeam35bpdXJzEw"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BlU3JTBGEeam35bpdXJzEw" points="[35, -9, -37, -11]$[72, 29, 0, 27]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BlU3JjBGEeam35bpdXJzEw" id="(0.68,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BlU3JzBGEeam35bpdXJzEw" id="(0.4633333333333333,0.2976190476190476)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_aBpSR8GHEeaALJQAf08uAg" type="StereotypeCommentLink" target="_aBpSQ8GHEeaALJQAf08uAg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_aBpSSMGHEeaALJQAf08uAg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aBpSTMGHEeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_BlU3JTBGEeam35bpdXJzEw" points="[35, -9, -37, -11]$[72, 29, 0, 27]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_BlU3JjBGEeam35bpdXJzEw" id="(0.68,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_BlU3JzBGEeam35bpdXJzEw" id="(0.4633333333333333,0.2976190476190476)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_aBpSR8GHEeaALJQAf08uAg" type="StereotypeCommentLink" target="_aBpSQ8GHEeaALJQAf08uAg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_aBpSSMGHEeaALJQAf08uAg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aBpSTMGHEeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aBpSScGHEeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aBpSSsGHEeaALJQAf08uAg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aBpSS8GHEeaALJQAf08uAg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_aBpSScGHEeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aBpSSsGHEeaALJQAf08uAg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aBpSS8GHEeaALJQAf08uAg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_EYfToBM4Eee0L_IMWjydgQ" type="Dependency_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_GbpwIBM2Eee0L_IMWjydgQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_EYfToxM4Eee0L_IMWjydgQ" type="Dependency_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EYfTpBM4Eee0L_IMWjydgQ" x="3" y="-12"/>
+    <edges xsi:type="notation:Connector" xmi:id="_EYfToBM4Eee0L_IMWjydgQ" type="Dependency_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_GbpwIBM2Eee0L_IMWjydgQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_EYfToxM4Eee0L_IMWjydgQ" type="Dependency_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EYfTpBM4Eee0L_IMWjydgQ" x="3" y="-12"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EYfTpRM4Eee0L_IMWjydgQ" type="Dependency_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EYfTphM4Eee0L_IMWjydgQ" x="-7" y="8"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EYfTpRM4Eee0L_IMWjydgQ" type="Dependency_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EYfTphM4Eee0L_IMWjydgQ" x="-7" y="8"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_EYfToRM4Eee0L_IMWjydgQ"/>
-      <element xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EYfTohM4Eee0L_IMWjydgQ" points="[305, 3, -189, -2]$[494, 5, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EYfTpxM4Eee0L_IMWjydgQ" id="(1.0,0.4411764705882353)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EYfTqBM4Eee0L_IMWjydgQ" id="(0.0,0.4383561643835616)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_EYfToRM4Eee0L_IMWjydgQ"/>
+      <element href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EYfTohM4Eee0L_IMWjydgQ" points="[305, 3, -189, -2]$[494, 5, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EYfTpxM4Eee0L_IMWjydgQ" id="(1.0,0.4411764705882353)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EYfTqBM4Eee0L_IMWjydgQ" id="(0.0,0.4383561643835616)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_n4p8MCNtEeenc_m30jt0Ow" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_SVZ1oIuOEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_n4p8MSNtEeenc_m30jt0Ow"/>
+    <edges xsi:type="notation:Connector" xmi:id="_n4p8MCNtEeenc_m30jt0Ow" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_SVZ1oIuOEeiu6boZkiJHCA">
+      <styles xsi:type="notation:FontStyle" xmi:id="_n4p8MSNtEeenc_m30jt0Ow"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n4p8MiNtEeenc_m30jt0Ow" points="[56, 58, 4, -81]$[139, 139, 87, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6kAsCNtEeenc_m30jt0Ow" id="(0.2,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6kAsSNtEeenc_m30jt0Ow" id="(0.475,0.5061728395061729)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4p8MiNtEeenc_m30jt0Ow" points="[56, 58, 4, -81]$[139, 139, 87, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6kAsCNtEeenc_m30jt0Ow" id="(0.2,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6kAsSNtEeenc_m30jt0Ow" id="(0.475,0.5061728395061729)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UgW_wFqtEeexvMtO2oNM9g" type="InterfaceRealization_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU16TBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UgW_w1qtEeexvMtO2oNM9g" type="InterfaceRealization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XVCGcIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UgW_xFqtEeexvMtO2oNM9g" y="40"/>
+    <edges xsi:type="notation:Connector" xmi:id="_UgW_wFqtEeexvMtO2oNM9g" type="InterfaceRealization_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU16TBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_UgW_w1qtEeexvMtO2oNM9g" type="InterfaceRealization_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XVCGcIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UgW_xFqtEeexvMtO2oNM9g" y="40"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UgW_xVqtEeexvMtO2oNM9g" type="InterfaceRealization_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XW02MIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UgW_xlqtEeexvMtO2oNM9g" y="60"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_UgW_xVqtEeexvMtO2oNM9g" type="InterfaceRealization_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XW02MIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_UgW_xlqtEeexvMtO2oNM9g" y="60"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_UgW_wVqtEeexvMtO2oNM9g"/>
-      <element xmi:type="uml:InterfaceRealization" href="TapiConnectivity.uml#_Uf33kFqtEeexvMtO2oNM9g"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UgW_wlqtEeexvMtO2oNM9g" points="[13, -209, -643984, -643984]$[-98, -209, -643984, -643984]$[-98, -109, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uh534FqtEeexvMtO2oNM9g" id="(0.0,0.5441176470588235)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uh534VqtEeexvMtO2oNM9g" id="(0.37037037037037035,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_UgW_wVqtEeexvMtO2oNM9g"/>
+      <element href="TapiConnectivity.uml#_Uf33kFqtEeexvMtO2oNM9g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UgW_wlqtEeexvMtO2oNM9g" points="[13, -209, -643984, -643984]$[-98, -209, -643984, -643984]$[-98, -109, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uh534FqtEeexvMtO2oNM9g" id="(0.0,0.5441176470588235)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uh534VqtEeexvMtO2oNM9g" id="(0.37037037037037035,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_0AJaQ2JqEeek3OrhDuslYQ" type="StereotypeCommentLink" target="_0AIzM2JqEeek3OrhDuslYQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_0AJaRGJqEeek3OrhDuslYQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0AJaSGJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_0AJaQ2JqEeek3OrhDuslYQ" type="StereotypeCommentLink" target="_0AIzM2JqEeek3OrhDuslYQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_0AJaRGJqEeek3OrhDuslYQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0AJaSGJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0AJaRWJqEeek3OrhDuslYQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0AJaRmJqEeek3OrhDuslYQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0AJaR2JqEeek3OrhDuslYQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_0AJaRWJqEeek3OrhDuslYQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0AJaRmJqEeek3OrhDuslYQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0AJaR2JqEeek3OrhDuslYQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_IC8_N2NFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IC8_M2NFEee0bPnI-Gt-mQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_IC8_OGNFEee0bPnI-Gt-mQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IC8_PGNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_IC8_N2NFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IC8_M2NFEee0bPnI-Gt-mQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IC8_OGNFEee0bPnI-Gt-mQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IC8_PGNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IC8_OWNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IC8_OmNFEee0bPnI-Gt-mQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IC8_O2NFEee0bPnI-Gt-mQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IC8_OWNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IC8_OmNFEee0bPnI-Gt-mQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IC8_O2NFEee0bPnI-Gt-mQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_IEdbFGNFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IEdbEGNFEee0bPnI-Gt-mQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_IEdbFWNFEee0bPnI-Gt-mQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IEdbGWNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
+    <edges xsi:type="notation:Connector" xmi:id="_IEdbFGNFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IEdbEGNFEee0bPnI-Gt-mQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IEdbFWNFEee0bPnI-Gt-mQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEdbGWNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IEdbFmNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IEdbF2NFEee0bPnI-Gt-mQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IEdbGGNFEee0bPnI-Gt-mQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEdbFmNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEdbF2NFEee0bPnI-Gt-mQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEdbGGNFEee0bPnI-Gt-mQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XDTqEHIZEeeSiaQ95-6r9w" type="Abstraction_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_XDURIHIZEeeSiaQ95-6r9w" type="Abstraction_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__j0IEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDURIXIZEeeSiaQ95-6r9w" x="-2" y="-12"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XDTqEHIZEeeSiaQ95-6r9w" type="Abstraction_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_XDURIHIZEeeSiaQ95-6r9w" type="Abstraction_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__j0IEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_XDURIXIZEeeSiaQ95-6r9w" x="-2" y="-12"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_XDURInIZEeeSiaQ95-6r9w" type="Abstraction_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__mfooKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDURI3IZEeeSiaQ95-6r9w" x="-2" y="7"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_XDURInIZEeeSiaQ95-6r9w" type="Abstraction_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__mfooKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_XDURI3IZEeeSiaQ95-6r9w" x="-2" y="7"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_XDTqEXIZEeeSiaQ95-6r9w"/>
-      <element xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XDTqEnIZEeeSiaQ95-6r9w" points="[686, 327, -643984, -643984]$[841, 327, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XF65MHIZEeeSiaQ95-6r9w" id="(1.0,0.6607142857142857)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XF65MXIZEeeSiaQ95-6r9w" id="(0.0,0.7777777777777778)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_XDTqEXIZEeeSiaQ95-6r9w"/>
+      <element href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XDTqEnIZEeeSiaQ95-6r9w" points="[686, 327, -643984, -643984]$[841, 327, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XF65MHIZEeeSiaQ95-6r9w" id="(1.0,0.6607142857142857)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XF65MXIZEeeSiaQ95-6r9w" id="(0.0,0.7777777777777778)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_DXw14KLUEeeG6K0eZHmVww" type="Dependency_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_GbpwIBM2Eee0L_IMWjydgQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_DXw146LUEeeG6K0eZHmVww" type="Dependency_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DXw15KLUEeeG6K0eZHmVww" x="-2" y="13"/>
+    <edges xsi:type="notation:Connector" xmi:id="_DXw14KLUEeeG6K0eZHmVww" type="Dependency_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_GbpwIBM2Eee0L_IMWjydgQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_DXw146LUEeeG6K0eZHmVww" type="Dependency_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DXw15KLUEeeG6K0eZHmVww" x="-2" y="13"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DXw15aLUEeeG6K0eZHmVww" type="Dependency_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DXxc8KLUEeeG6K0eZHmVww" x="2" y="-11"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DXw15aLUEeeG6K0eZHmVww" type="Dependency_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DXxc8KLUEeeG6K0eZHmVww" x="2" y="-11"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_DXw14aLUEeeG6K0eZHmVww"/>
-      <element xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DXw14qLUEeeG6K0eZHmVww" points="[0, 0, 329, -5]$[-329, 5, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DXyEAKLUEeeG6K0eZHmVww" id="(0.0,0.4375)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DXyEAaLUEeeG6K0eZHmVww" id="(1.0,0.3150684931506849)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_DXw14aLUEeeG6K0eZHmVww"/>
+      <element href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DXw14qLUEeeG6K0eZHmVww" points="[0, 0, 329, -5]$[-329, 5, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DXyEAKLUEeeG6K0eZHmVww" id="(0.0,0.4375)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DXyEAaLUEeeG6K0eZHmVww" id="(1.0,0.3150684931506849)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_9msK4IuNEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0MDBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZAIuNEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZAYuNEeiu6boZkiJHCA" x="-35" y="-1"/>
+    <edges xsi:type="notation:Connector" xmi:id="_9msK4IuNEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0MDBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZAIuNEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZAYuNEeiu6boZkiJHCA" x="-35" y="-1"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZAouNEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZA4uNEeiu6boZkiJHCA" x="-52" y="-1"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZAouNEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZA4uNEeiu6boZkiJHCA" x="-52" y="-1"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZBIuNEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZBYuNEeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZBIuNEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZBYuNEeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZBouNEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZB4uNEeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZBouNEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZB4uNEeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZCIuNEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZCYuNEeiu6boZkiJHCA" x="-16" y="-14"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZCIuNEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZCYuNEeiu6boZkiJHCA" x="-16" y="-14"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZCouNEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZC4uNEeiu6boZkiJHCA" x="13" y="16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZCouNEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZC4uNEeiu6boZkiJHCA" x="13" y="16"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_9msx8IuNEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9msx8YuNEeiu6boZkiJHCA" points="[139, -178, -643984, -643984]$[-15, -3, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-r6GgIuNEeiu6boZkiJHCA" id="(0.031862745098039214,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__L84gIuNEeiu6boZkiJHCA" id="(0.925,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_9msx8IuNEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_9msx8YuNEeiu6boZkiJHCA" points="[139, -178, -643984, -643984]$[-15, -3, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-r6GgIuNEeiu6boZkiJHCA" id="(0.031862745098039214,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__L84gIuNEeiu6boZkiJHCA" id="(0.925,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ExLboIuOEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0cTBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCsIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCsYuOEeiu6boZkiJHCA" x="-32" y="3"/>
+    <edges xsi:type="notation:Connector" xmi:id="_ExLboIuOEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0cTBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCsIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCsYuOEeiu6boZkiJHCA" x="-32" y="3"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCsouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCs4uOEeiu6boZkiJHCA" x="-46" y="13"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCsouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCs4uOEeiu6boZkiJHCA" x="-46" y="13"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCtIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCtYuOEeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCtIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCtYuOEeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCtouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCt4uOEeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCtouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCt4uOEeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCuIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCuYuOEeiu6boZkiJHCA" x="-14" y="18"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCuIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCuYuOEeiu6boZkiJHCA" x="-14" y="18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCuouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMpwIuOEeiu6boZkiJHCA" x="15" y="-16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCuouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMpwIuOEeiu6boZkiJHCA" x="15" y="-16"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ExLboYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ExLboouOEeiu6boZkiJHCA" points="[194, -178, -643984, -643984]$[323, 1, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FswTEIuOEeiu6boZkiJHCA" id="(0.9779411764705882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GC4UEIuOEeiu6boZkiJHCA" id="(0.8125,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_ExLboYuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ExLboouOEeiu6boZkiJHCA" points="[194, -178, -643984, -643984]$[323, 1, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FswTEIuOEeiu6boZkiJHCA" id="(0.9779411764705882,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_GC4UEIuOEeiu6boZkiJHCA" id="(0.8125,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_KvwS4IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS44uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MWMFMIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS5IuOEeiu6boZkiJHCA" x="1" y="-18"/>
+    <edges xsi:type="notation:Connector" xmi:id="_KvwS4IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS44uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MWMFMIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS5IuOEeiu6boZkiJHCA" x="1" y="-18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS5YuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MXj-MIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS5ouOEeiu6boZkiJHCA" x="24" y="8"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS5YuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MXj-MIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS5ouOEeiu6boZkiJHCA" x="24" y="8"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS54uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MZOLEIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS6IuOEeiu6boZkiJHCA" x="-50" y="-43"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS54uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MZOLEIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS6IuOEeiu6boZkiJHCA" x="-50" y="-43"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS6YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MahyoIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS6ouOEeiu6boZkiJHCA" x="-65" y="18"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS6YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MahyoIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS6ouOEeiu6boZkiJHCA" x="-65" y="18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS64uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Mb65wIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS7IuOEeiu6boZkiJHCA" x="12" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS64uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Mb65wIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS7IuOEeiu6boZkiJHCA" x="12" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS7YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MdcjwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS7ouOEeiu6boZkiJHCA" x="-7" y="-13"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS7YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MdcjwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS7ouOEeiu6boZkiJHCA" x="-7" y="-13"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_KvwS4YuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KvwS4ouOEeiu6boZkiJHCA" points="[381, 1, -643984, -643984]$[381, -26, -643984, -643984]$[262, -26, -643984, -643984]$[262, 1, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L8aTQIuOEeiu6boZkiJHCA" id="(0.6634615384615384,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MU2BYIuOEeiu6boZkiJHCA" id="(0.09134615384615384,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_KvwS4YuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_KvwS4ouOEeiu6boZkiJHCA" points="[381, 1, -643984, -643984]$[381, -26, -643984, -643984]$[262, -26, -643984, -643984]$[262, 1, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_L8aTQIuOEeiu6boZkiJHCA" id="(0.6634615384615384,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_MU2BYIuOEeiu6boZkiJHCA" id="(0.09134615384615384,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_SVZ1oIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1o4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVZ1pIuOEeiu6boZkiJHCA" x="-1" y="8"/>
+    <edges xsi:type="notation:Connector" xmi:id="_SVZ1oIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1o4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVZ1pIuOEeiu6boZkiJHCA" x="-1" y="8"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1pYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVZ1pouOEeiu6boZkiJHCA" x="-3" y="-15"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1pYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVZ1pouOEeiu6boZkiJHCA" x="-3" y="-15"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1p4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVZ1qIuOEeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1p4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVZ1qIuOEeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1qYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVacsIuOEeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1qYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVacsIuOEeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SVacsYuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVacsouOEeiu6boZkiJHCA" x="-18" y="16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SVacsYuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVacsouOEeiu6boZkiJHCA" x="-18" y="16"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SVacs4uOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVactIuOEeiu6boZkiJHCA" x="20" y="16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SVacs4uOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVactIuOEeiu6boZkiJHCA" x="20" y="16"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_SVZ1oYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SVZ1oouOEeiu6boZkiJHCA" points="[38, 33, -643984, -643984]$[243, 28, -643984, -643984]"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_SVZ1oYuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SVZ1oouOEeiu6boZkiJHCA" points="[38, 33, -643984, -643984]$[243, 28, -643984, -643984]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YeNm8IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0sjBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOAIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X0qEoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOAYuOEeiu6boZkiJHCA" x="-18" y="4"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOAouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X3tYoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOA4uOEeiu6boZkiJHCA" x="-42" y="6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOBIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X6dxsKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOBYuOEeiu6boZkiJHCA" x="34" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOBouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X9QnAKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOB4uOEeiu6boZkiJHCA" x="-34" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YeO1EIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YAVJIKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeO1EYuOEeiu6boZkiJHCA" x="12" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YeO1EouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YDJMkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeO1E4uOEeiu6boZkiJHCA" x="-17" y="17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YeNm8YuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YeNm8ouOEeiu6boZkiJHCA" points="[-33, 60, -643984, -643984]$[-42, 288, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFD4IKSdEeiKJbr6a5Jjpg" id="(0.48125,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFD4IaSdEeiKJbr6a5Jjpg" id="(0.6195652173913043,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_akbskIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_akbsk4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bo0hwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_akbslIuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_akbslYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bqIwYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_akbslouOEeiu6boZkiJHCA" x="39" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_akcToIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_breNIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcToYuOEeiu6boZkiJHCA" x="42" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_akcToouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bs0Q8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcTo4uOEeiu6boZkiJHCA" x="-42" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_akcTpIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_buKUwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcTpYuOEeiu6boZkiJHCA" x="11" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_akcTpouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bv_gwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcTp4uOEeiu6boZkiJHCA" x="-11" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_akbskYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_akbskouOEeiu6boZkiJHCA" points="[-61, 355, -643984, -643984]$[-61, 456, -643984, -643984]$[148, 456, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bnUs8IuOEeiu6boZkiJHCA" id="(0.532608695652174,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bnUs8YuOEeiu6boZkiJHCA" id="(0.0,0.5)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_dB1jIIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KMIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XnUMMKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KMYuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KMouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XpG78KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KM4uOEeiu6boZkiJHCA" x="-8" y="-9"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KNIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XrJjUKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KNYuOEeiu6boZkiJHCA" x="22" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KNouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XtwLYKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KN4uOEeiu6boZkiJHCA" x="-22" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KOIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xv6HgKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KOYuOEeiu6boZkiJHCA" x="10" y="11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KOouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xx2oQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KO4uOEeiu6boZkiJHCA" x="-11" y="13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_dB1jIYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dB1jIouOEeiu6boZkiJHCA" points="[25, 307, -643984, -643984]$[158, 318, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h1O_cJ_AEeiO_KvaRsULdw" id="(1.0,0.44776119402985076)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eNCyAIuOEeiu6boZkiJHCA" id="(0.0,0.5483870967741935)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_foWSYIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_foW5couOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gsny0IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5c4uOEeiu6boZkiJHCA" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_foW5dIuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_guA58IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5dYuOEeiu6boZkiJHCA" y="-5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_foW5douOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gvYy8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5d4uOEeiu6boZkiJHCA" x="24" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_foW5eIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gwwE4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5eYuOEeiu6boZkiJHCA" x="-24" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_foW5eouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gyE6kIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5e4uOEeiu6boZkiJHCA" x="14" y="-21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_foW5fIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g0ac4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5fYuOEeiu6boZkiJHCA" x="-11" y="-19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_foW5cIuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_foW5cYuOEeiu6boZkiJHCA" points="[265, 284, -643984, -643984]$[281, 218, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_grDFgIuOEeiu6boZkiJHCA" id="(0.4117647058823529,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_grDFgYuOEeiu6boZkiJHCA" id="(0.46511627906976744,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jFNa0IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa04uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YtL10J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa1IuOEeiu6boZkiJHCA" x="-7" y="6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa1YuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YwzKgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa1ouOEeiu6boZkiJHCA" x="-19" y="11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa14uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y0kQMJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa2IuOEeiu6boZkiJHCA" x="16" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa2YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y4fG4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa2ouOEeiu6boZkiJHCA" x="-16" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa24uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y8HCoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa3IuOEeiu6boZkiJHCA" x="16" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa3YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y-ZhoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa3ouOEeiu6boZkiJHCA" x="-11" y="17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_jFNa0YuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jFNa0ouOEeiu6boZkiJHCA" points="[322, 65, -643984, -643984]$[242, 171, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ki1PYIuOEeiu6boZkiJHCA" id="(0.0625,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lUrjEIuOEeiu6boZkiJHCA" id="(0.4108527131782946,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mliuAIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_mliuA4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuBIuOEeiu6boZkiJHCA" x="-24" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mliuBYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuBouOEeiu6boZkiJHCA" x="-38" y="-10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mliuB4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuCIuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mliuCYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuCouOEeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mliuC4uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuDIuOEeiu6boZkiJHCA" x="-21" y="-12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mliuDYuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuDouOEeiu6boZkiJHCA" x="22" y="-19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_mliuAYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mliuAouOEeiu6boZkiJHCA" points="[341, 65, -643984, -643984]$[347, 284, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oSA24IuOEeiu6boZkiJHCA" id="(0.5480769230769231,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nnt8sIuOEeiu6boZkiJHCA" id="(0.7803921568627451,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_szL8AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_6_LyABMjEee0L_IMWjydgQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_szL8A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2RUpAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_szL8BIuOEeiu6boZkiJHCA" x="12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_szL8BYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2Ti2kKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_szL8BouOEeiu6boZkiJHCA" x="-13" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_szMjEIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2W00EKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjEYuOEeiu6boZkiJHCA" x="13" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_szMjEouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2aS-0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjE4uOEeiu6boZkiJHCA" x="-14" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_szMjFIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2cvO0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjFYuOEeiu6boZkiJHCA" x="13" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_szMjFouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2e4j4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjF4uOEeiu6boZkiJHCA" x="-14" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_szL8AYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_szL8AouOEeiu6boZkiJHCA" points="[934, -189, -643984, -643984]$[937, -94, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2hvqoKFIEeiKJbr6a5Jjpg" id="(0.4563106796116505,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_23NlsIuOEeiu6boZkiJHCA" id="(0.4918918918918919,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_unw4AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_6_LyABMjEee0L_IMWjydgQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_unw4A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vh_roIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unw4BIuOEeiu6boZkiJHCA" x="-27" y="-9"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_unxfEIuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vjxNQIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfEYuOEeiu6boZkiJHCA" x="-11" y="-12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_unxfEouOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vlFb4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfE4uOEeiu6boZkiJHCA" x="32" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_unxfFIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vmbfsIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfFYuOEeiu6boZkiJHCA" x="-33" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_unxfFouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vnwVYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfF4uOEeiu6boZkiJHCA" x="14" y="-21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_unxfGIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vpFyIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfGYuOEeiu6boZkiJHCA" x="-13" y="-26"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_unw4AYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unw4AouOEeiu6boZkiJHCA" points="[990, 82, -643984, -643984]$[990, -33, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vgM74IuOEeiu6boZkiJHCA" id="(0.874251497005988,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vgNi8IuOEeiu6boZkiJHCA" id="(0.8216216216216217,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_yv1goIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_BlU3KDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_yv1go4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1-ZF8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv1gpIuOEeiu6boZkiJHCA" x="-8" y="10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_yv1gpYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2CrwEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv1gpouOEeiu6boZkiJHCA" x="-23" y="6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HsIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2HFH4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2HsYuOEeiu6boZkiJHCA" x="17" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HsouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2KPJkKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2Hs4uOEeiu6boZkiJHCA" x="-17" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HtIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2MhBgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2HtYuOEeiu6boZkiJHCA" x="11" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HtouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2PHCgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2Ht4uOEeiu6boZkiJHCA" x="-6" y="16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_yv1goYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yv1goouOEeiu6boZkiJHCA" points="[870, -33, -643984, -643984]$[870, 82, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0xJ4IIuOEeiu6boZkiJHCA" id="(0.1783783783783784,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z74dAIuOEeiu6boZkiJHCA" id="(0.16167664670658682,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4u1OoIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_4u11sIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U2QW8KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11sYuOEeiu6boZkiJHCA" x="23" y="-3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4u11souOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U4WosKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11s4uOEeiu6boZkiJHCA" x="10" y="-6"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4u11tIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U67bkKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11tYuOEeiu6boZkiJHCA" x="32" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4u11touOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U9aH0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11t4uOEeiu6boZkiJHCA" x="-32" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4u11uIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U_OFsKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11uYuOEeiu6boZkiJHCA" x="16" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4u11uouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VBOQ0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11u4uOEeiu6boZkiJHCA" x="-9" y="19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_4u1OoYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4u1OoouOEeiu6boZkiJHCA" points="[837, -61, -643984, -643984]$[717, -61, -643984, -643984]$[717, 78, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5pybAIuOEeiu6boZkiJHCA" id="(0.0,0.5254237288135594)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VDUikKDFEeiO_KvaRsULdw" id="(0.6369426751592356,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_8R9-MIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lQIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3NMbYKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lQYuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lQouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3PTUMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lQ4uOEeiu6boZkiJHCA" x="8" y="-5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lRIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3RcCMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lRYuOEeiu6boZkiJHCA" x="22" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lRouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3TZKAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lR4uOEeiu6boZkiJHCA" x="-22" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lSIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3Vgp4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lSYuOEeiu6boZkiJHCA" x="7" y="-16"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lSouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3XnisKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lS4uOEeiu6boZkiJHCA" x="-11" y="-18"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_8R9-MYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8R9-MouOEeiu6boZkiJHCA" points="[983, 140, -643984, -643984]$[983, 278, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_992RMIuOEeiu6boZkiJHCA" id="(0.8383233532934131,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9kZPYIuOEeiu6boZkiJHCA" id="(0.8304093567251462,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__VTMUIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__VTMU4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3aP_8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTMVIuOEeiu6boZkiJHCA" x="-22" y="-7"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__VTMVYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3dFRgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTMVouOEeiu6boZkiJHCA" x="-40" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__VTzYIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3gIlgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzYYuOEeiu6boZkiJHCA" x="22" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__VTzYouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3it_cKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzY4uOEeiu6boZkiJHCA" x="-22" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__VTzZIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3kxN4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzZYuOEeiu6boZkiJHCA" x="11" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__VTzZouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3nACgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzZ4uOEeiu6boZkiJHCA" x="-11" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__VTMUYuOEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__VTMUouOEeiu6boZkiJHCA" points="[880, 140, -643984, -643984]$[880, 209, -643984, -643984]$[876, 209, -643984, -643984]$[876, 278, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AE2Z8IuPEeiu6boZkiJHCA" id="(0.19760479041916168,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AZkFsIuPEeiu6boZkiJHCA" id="(0.2046783625730994,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_EplwcIuPEeiu6boZkiJHCA" type="Association_Edge" source="_luMgoBMjEee0L_IMWjydgQ" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Eplwc4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FyRPwIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EplwdIuPEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EplwdYuPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FzkQQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EplwdouPEeiu6boZkiJHCA" x="-91" y="-2"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Eplwd4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F08JQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXgIuPEeiu6boZkiJHCA" x="34" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EpmXgYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F2VQYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXgouPEeiu6boZkiJHCA" x="-34" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EpmXg4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F3pfAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXhIuPEeiu6boZkiJHCA" x="12" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EpmXhYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F546sIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXhouPEeiu6boZkiJHCA" x="-17" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_EplwcYuPEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EplwcouPEeiu6boZkiJHCA" points="[717, 137, -643984, -643984]$[717, 288, -643984, -643984]$[841, 288, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fwmb0IuPEeiu6boZkiJHCA" id="(0.6369426751592356,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fwmb0YuPEeiu6boZkiJHCA" id="(0.0,0.15873015873015872)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_IDRpEIuPEeiu6boZkiJHCA" type="Association_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQIYuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JVuIYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDSQIouPEeiu6boZkiJHCA" x="-3" y="-12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQI4uPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JXEzQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDSQJIuPEeiu6boZkiJHCA" y="11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQJYuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JYZo8IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDSQJouPEeiu6boZkiJHCA" x="24" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQJ4uPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JZueoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDS3MIuPEeiu6boZkiJHCA" x="-25" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDS3MYuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JbeyIIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDS3MouPEeiu6boZkiJHCA" x="12" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDS3M4uPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JdinoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDS3NIuPEeiu6boZkiJHCA" x="-6" y="18"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_IDRpEYuPEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IDSQIIuPEeiu6boZkiJHCA" points="[547, 323, -643984, -643984]$[413, 323, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JT8mwIuPEeiu6boZkiJHCA" id="(0.0,0.5892857142857143)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JT8mwYuPEeiu6boZkiJHCA" id="(1.0,0.6290322580645161)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_SHRdkIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_SHRdk4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VL7hYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHRdlIuPEeiu6boZkiJHCA" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SHRdlYuPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VNUBcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHRdlouPEeiu6boZkiJHCA" x="4" y="11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SHRdl4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VPGxMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEoIuPEeiu6boZkiJHCA" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SHSEoYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VRQGQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEoouPEeiu6boZkiJHCA" x="-36" y="-12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SHSEo4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VTbQgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEpIuPEeiu6boZkiJHCA" x="8" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SHSEpYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VVa0kIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEpouPEeiu6boZkiJHCA" x="-9" y="9"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_SHRdkYuPEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_B3JLoEHCEeWqPKyD1j6LMg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SHRdkouPEeiu6boZkiJHCA" points="[859, 341, -643984, -643984]$[859, 387, -643984, -643984]$[397, 387, -643984, -643984]$[397, 346, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VKNDEIuPEeiu6boZkiJHCA" id="(0.10526315789473684,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VKNDEYuPEeiu6boZkiJHCA" id="(0.9411764705882353,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZtSzwIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa0IuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a5-CQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa0YuPEeiu6boZkiJHCA" x="2" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa0ouPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a7VUMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa04uPEeiu6boZkiJHCA" x="-2" y="9"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa1IuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a8rYAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa1YuPEeiu6boZkiJHCA" x="8" y="24"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa1ouPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a-D4EIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa14uPEeiu6boZkiJHCA" x="-60" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa2IuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a_gpkIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa2YuPEeiu6boZkiJHCA" x="9" y="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa2ouPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bBeYcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa24uPEeiu6boZkiJHCA" x="-10" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZtSzwYuPEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZtSzwouPEeiu6boZkiJHCA" points="[371, 346, -643984, -643984]$[371, 408, -643984, -643984]$[912, 408, -643984, -643984]$[912, 341, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4VqkIuPEeiu6boZkiJHCA" id="(0.8392156862745098,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4WRoIuPEeiu6boZkiJHCA" id="(0.4152046783625731,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ihLEMIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEM4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jik20IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLENIuPEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ihLENYuPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jj4eYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLENouPEeiu6boZkiJHCA" x="77" y="10"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEN4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jlOiMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEOIuPEeiu6boZkiJHCA" x="96" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEOYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jmmbMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEOouPEeiu6boZkiJHCA" x="-96" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEO4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jn738IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEPIuPEeiu6boZkiJHCA" x="9" y="12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEPYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jpPfgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEPouPEeiu6boZkiJHCA" x="-8" y="12"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ihLEMYuPEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ihLEMouPEeiu6boZkiJHCA" points="[816, 346, -643984, -643984]$[816, 456, -643984, -643984]$[312, 456, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jgqLQIuPEeiu6boZkiJHCA" id="(0.672514619883041,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jgqLQYuPEeiu6boZkiJHCA" id="(1.0,0.5)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_WJr-UJ_AEeiO_KvaRsULdw" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="255">
-      <children xmi:type="notation:DecorationNode" xmi:id="_WJslYJ_AEeiO_KvaRsULdw" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jdTwgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJslYZ_AEeiO_KvaRsULdw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMcJ_AEeiO_KvaRsULdw" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jfgI4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMcZ_AEeiO_KvaRsULdw" x="2" y="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMcp_AEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jhu9gJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMc5_AEeiO_KvaRsULdw" x="15" y="-82"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMdJ_AEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jj3EcJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMdZ_AEeiO_KvaRsULdw" x="-77" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMdp_AEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jmgIwJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMd5_AEeiO_KvaRsULdw" x="8" y="17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMeJ_AEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jpfLUJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMeZ_AEeiO_KvaRsULdw" x="-11" y="10"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_WJr-UZ_AEeiO_KvaRsULdw"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WJr-Up_AEeiO_KvaRsULdw" points="[280, 346, -643984, -643984]$[280, 373, -643984, -643984]$[170, 373, -643984, -643984]$[170, 346, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4aXQJ_AEeiO_KvaRsULdw" id="(0.4823529411764706,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SQUJ_AEeiO_KvaRsULdw" id="(0.047058823529411764,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_snmgYJ_BEeiO_KvaRsULdw" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear" lineColor="255">
-      <children xmi:type="notation:DecorationNode" xmi:id="_snmgY5_BEeiO_KvaRsULdw" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x8HuAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_snmgZJ_BEeiO_KvaRsULdw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_snnHcJ_BEeiO_KvaRsULdw" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x--NsJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHcZ_BEeiO_KvaRsULdw" x="15" y="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_snnHcp_BEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yA2dAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHc5_BEeiO_KvaRsULdw" x="93" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_snnHdJ_BEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yCsQEJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHdZ_BEeiO_KvaRsULdw" x="-93" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_snnHdp_BEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yEoJwJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHd5_BEeiO_KvaRsULdw" x="10" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_snnHeJ_BEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yGcusJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHeZ_BEeiO_KvaRsULdw" x="-11" y="18"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_snmgYZ_BEeiO_KvaRsULdw"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_sWjMoJ_BEeiO_KvaRsULdw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_snmgYp_BEeiO_KvaRsULdw" points="[426, 65, -643984, -643984]$[426, 108, -643984, -643984]$[618, 108, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_stZmYJ_BEeiO_KvaRsULdw" id="(0.875,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_staNcJ_BEeiO_KvaRsULdw" id="(0.0,0.5084745762711864)"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YeNm8IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0sjBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOAIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X0qEoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOAYuOEeiu6boZkiJHCA" x="-18" y="4"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOAouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X3tYoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOA4uOEeiu6boZkiJHCA" x="-42" y="6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOBIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X6dxsKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOBYuOEeiu6boZkiJHCA" x="34" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOBouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X9QnAKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOB4uOEeiu6boZkiJHCA" x="-34" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YeO1EIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YAVJIKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeO1EYuOEeiu6boZkiJHCA" x="12" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_YeO1EouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YDJMkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeO1E4uOEeiu6boZkiJHCA" x="-17" y="17"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_YeNm8YuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YeNm8ouOEeiu6boZkiJHCA" points="[-33, 60, -643984, -643984]$[-42, 288, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YFD4IKSdEeiKJbr6a5Jjpg" id="(0.48125,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YFD4IaSdEeiKJbr6a5Jjpg" id="(0.6195652173913043,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_akbskIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_akbsk4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bo0hwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_akbslIuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_akbslYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bqIwYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_akbslouOEeiu6boZkiJHCA" x="39" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_akcToIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_breNIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcToYuOEeiu6boZkiJHCA" x="42" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_akcToouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bs0Q8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcTo4uOEeiu6boZkiJHCA" x="-42" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_akcTpIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_buKUwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcTpYuOEeiu6boZkiJHCA" x="11" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_akcTpouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bv_gwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcTp4uOEeiu6boZkiJHCA" x="-11" y="-13"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_akbskYuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_akbskouOEeiu6boZkiJHCA" points="[-61, 355, -643984, -643984]$[-61, 456, -643984, -643984]$[148, 456, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnUs8IuOEeiu6boZkiJHCA" id="(0.532608695652174,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnUs8YuOEeiu6boZkiJHCA" id="(0.0,0.5)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_dB1jIIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" lineColor="0">
+      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KMIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XnUMMKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KMYuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KMouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XpG78KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KM4uOEeiu6boZkiJHCA" x="-8" y="-9"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KNIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XrJjUKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KNYuOEeiu6boZkiJHCA" x="22" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KNouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XtwLYKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KN4uOEeiu6boZkiJHCA" x="-22" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KOIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xv6HgKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KOYuOEeiu6boZkiJHCA" x="10" y="11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KOouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xx2oQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KO4uOEeiu6boZkiJHCA" x="-11" y="13"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_dB1jIYuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dB1jIouOEeiu6boZkiJHCA" points="[25, 307, -643984, -643984]$[158, 318, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_h1O_cJ_AEeiO_KvaRsULdw" id="(1.0,0.44776119402985076)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_eNCyAIuOEeiu6boZkiJHCA" id="(0.0,0.5483870967741935)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_foWSYIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_foW5couOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gsny0IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5c4uOEeiu6boZkiJHCA" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_foW5dIuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_guA58IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5dYuOEeiu6boZkiJHCA" y="-5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_foW5douOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gvYy8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5d4uOEeiu6boZkiJHCA" x="24" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_foW5eIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gwwE4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5eYuOEeiu6boZkiJHCA" x="-24" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_foW5eouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gyE6kIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5e4uOEeiu6boZkiJHCA" x="14" y="-21"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_foW5fIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_g0ac4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5fYuOEeiu6boZkiJHCA" x="-11" y="-19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_foW5cIuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_foW5cYuOEeiu6boZkiJHCA" points="[265, 284, -643984, -643984]$[281, 218, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_grDFgIuOEeiu6boZkiJHCA" id="(0.4117647058823529,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_grDFgYuOEeiu6boZkiJHCA" id="(0.46511627906976744,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_jFNa0IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa04uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YtL10J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa1IuOEeiu6boZkiJHCA" x="-7" y="6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa1YuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YwzKgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa1ouOEeiu6boZkiJHCA" x="-19" y="11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa14uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y0kQMJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa2IuOEeiu6boZkiJHCA" x="16" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa2YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y4fG4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa2ouOEeiu6boZkiJHCA" x="-16" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa24uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y8HCoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa3IuOEeiu6boZkiJHCA" x="16" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa3YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y-ZhoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa3ouOEeiu6boZkiJHCA" x="-11" y="17"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_jFNa0YuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_jFNa0ouOEeiu6boZkiJHCA" points="[322, 65, -643984, -643984]$[242, 171, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ki1PYIuOEeiu6boZkiJHCA" id="(0.0625,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lUrjEIuOEeiu6boZkiJHCA" id="(0.4108527131782946,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_mliuAIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_mliuA4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuBIuOEeiu6boZkiJHCA" x="-24" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_mliuBYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuBouOEeiu6boZkiJHCA" x="-38" y="-10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_mliuB4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuCIuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_mliuCYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuCouOEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_mliuC4uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuDIuOEeiu6boZkiJHCA" x="-21" y="-12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_mliuDYuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuDouOEeiu6boZkiJHCA" x="22" y="-19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_mliuAYuOEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_mliuAouOEeiu6boZkiJHCA" points="[341, 65, -643984, -643984]$[347, 284, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oSA24IuOEeiu6boZkiJHCA" id="(0.5480769230769231,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nnt8sIuOEeiu6boZkiJHCA" id="(0.7803921568627451,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_szL8AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_6_LyABMjEee0L_IMWjydgQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_szL8A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2RUpAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_szL8BIuOEeiu6boZkiJHCA" x="12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_szL8BYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2Ti2kKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_szL8BouOEeiu6boZkiJHCA" x="-13" y="3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_szMjEIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2W00EKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjEYuOEeiu6boZkiJHCA" x="13" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_szMjEouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2aS-0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjE4uOEeiu6boZkiJHCA" x="-14" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_szMjFIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2cvO0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjFYuOEeiu6boZkiJHCA" x="13" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_szMjFouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2e4j4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjF4uOEeiu6boZkiJHCA" x="-14" y="-20"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_szL8AYuOEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_szL8AouOEeiu6boZkiJHCA" points="[934, -189, -643984, -643984]$[937, -94, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2hvqoKFIEeiKJbr6a5Jjpg" id="(0.4563106796116505,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_23NlsIuOEeiu6boZkiJHCA" id="(0.4918918918918919,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_unw4AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_6_LyABMjEee0L_IMWjydgQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_unw4A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vh_roIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_unw4BIuOEeiu6boZkiJHCA" x="-27" y="-9"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_unxfEIuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vjxNQIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfEYuOEeiu6boZkiJHCA" x="-11" y="-12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_unxfEouOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vlFb4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfE4uOEeiu6boZkiJHCA" x="32" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_unxfFIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vmbfsIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfFYuOEeiu6boZkiJHCA" x="-33" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_unxfFouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vnwVYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfF4uOEeiu6boZkiJHCA" x="14" y="-21"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_unxfGIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vpFyIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfGYuOEeiu6boZkiJHCA" x="-13" y="-26"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_unw4AYuOEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_unw4AouOEeiu6boZkiJHCA" points="[990, 82, -643984, -643984]$[990, -33, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vgM74IuOEeiu6boZkiJHCA" id="(0.874251497005988,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vgNi8IuOEeiu6boZkiJHCA" id="(0.8216216216216217,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_yv1goIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_BlU3KDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_yv1go4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_1-ZF8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv1gpIuOEeiu6boZkiJHCA" x="-8" y="10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_yv1gpYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2CrwEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv1gpouOEeiu6boZkiJHCA" x="-23" y="6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HsIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2HFH4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2HsYuOEeiu6boZkiJHCA" x="17" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HsouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2KPJkKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2Hs4uOEeiu6boZkiJHCA" x="-17" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HtIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2MhBgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2HtYuOEeiu6boZkiJHCA" x="11" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HtouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2PHCgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2Ht4uOEeiu6boZkiJHCA" x="-6" y="16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_yv1goYuOEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_yv1goouOEeiu6boZkiJHCA" points="[870, -33, -643984, -643984]$[870, 82, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0xJ4IIuOEeiu6boZkiJHCA" id="(0.1783783783783784,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z74dAIuOEeiu6boZkiJHCA" id="(0.16167664670658682,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_4u1OoIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4u11sIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U2QW8KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11sYuOEeiu6boZkiJHCA" x="23" y="-3"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4u11souOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U4WosKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11s4uOEeiu6boZkiJHCA" x="10" y="-6"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4u11tIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U67bkKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11tYuOEeiu6boZkiJHCA" x="32" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4u11touOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U9aH0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11t4uOEeiu6boZkiJHCA" x="-32" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4u11uIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U_OFsKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11uYuOEeiu6boZkiJHCA" x="16" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4u11uouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VBOQ0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11u4uOEeiu6boZkiJHCA" x="-9" y="19"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_4u1OoYuOEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4u1OoouOEeiu6boZkiJHCA" points="[837, -61, -643984, -643984]$[717, -61, -643984, -643984]$[717, 78, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_5pybAIuOEeiu6boZkiJHCA" id="(0.0,0.5254237288135594)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VDUikKDFEeiO_KvaRsULdw" id="(0.6369426751592356,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_8R9-MIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lQIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3NMbYKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lQYuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lQouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3PTUMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lQ4uOEeiu6boZkiJHCA" x="8" y="-5"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lRIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3RcCMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lRYuOEeiu6boZkiJHCA" x="22" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lRouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3TZKAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lR4uOEeiu6boZkiJHCA" x="-22" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lSIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3Vgp4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lSYuOEeiu6boZkiJHCA" x="7" y="-16"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lSouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3XnisKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lS4uOEeiu6boZkiJHCA" x="-11" y="-18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_8R9-MYuOEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8R9-MouOEeiu6boZkiJHCA" points="[983, 140, -643984, -643984]$[983, 278, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_992RMIuOEeiu6boZkiJHCA" id="(0.8383233532934131,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9kZPYIuOEeiu6boZkiJHCA" id="(0.8304093567251462,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__VTMUIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__VTMU4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3aP_8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTMVIuOEeiu6boZkiJHCA" x="-22" y="-7"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__VTMVYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3dFRgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTMVouOEeiu6boZkiJHCA" x="-40" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__VTzYIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3gIlgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzYYuOEeiu6boZkiJHCA" x="22" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__VTzYouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3it_cKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzY4uOEeiu6boZkiJHCA" x="-22" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__VTzZIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3kxN4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzZYuOEeiu6boZkiJHCA" x="11" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__VTzZouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3nACgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzZ4uOEeiu6boZkiJHCA" x="-11" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__VTMUYuOEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__VTMUouOEeiu6boZkiJHCA" points="[880, 140, -643984, -643984]$[880, 209, -643984, -643984]$[876, 209, -643984, -643984]$[876, 278, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_AE2Z8IuPEeiu6boZkiJHCA" id="(0.19760479041916168,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_AZkFsIuPEeiu6boZkiJHCA" id="(0.2046783625730994,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_EplwcIuPEeiu6boZkiJHCA" type="Association_Edge" source="_luMgoBMjEee0L_IMWjydgQ" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="0">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Eplwc4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FyRPwIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EplwdIuPEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EplwdYuPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FzkQQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EplwdouPEeiu6boZkiJHCA" x="-91" y="-2"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Eplwd4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F08JQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXgIuPEeiu6boZkiJHCA" x="34" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EpmXgYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F2VQYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXgouPEeiu6boZkiJHCA" x="-34" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EpmXg4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F3pfAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXhIuPEeiu6boZkiJHCA" x="12" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_EpmXhYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F546sIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXhouPEeiu6boZkiJHCA" x="-17" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_EplwcYuPEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EplwcouPEeiu6boZkiJHCA" points="[717, 137, -643984, -643984]$[717, 288, -643984, -643984]$[841, 288, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Fwmb0IuPEeiu6boZkiJHCA" id="(0.6369426751592356,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Fwmb0YuPEeiu6boZkiJHCA" id="(0.0,0.15873015873015872)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_IDRpEIuPEeiu6boZkiJHCA" type="Association_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQIYuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JVuIYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDSQIouPEeiu6boZkiJHCA" x="-3" y="-12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQI4uPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JXEzQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDSQJIuPEeiu6boZkiJHCA" y="11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQJYuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JYZo8IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDSQJouPEeiu6boZkiJHCA" x="24" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQJ4uPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JZueoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDS3MIuPEeiu6boZkiJHCA" x="-25" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDS3MYuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JbeyIIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDS3MouPEeiu6boZkiJHCA" x="12" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDS3M4uPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JdinoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDS3NIuPEeiu6boZkiJHCA" x="-6" y="18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_IDRpEYuPEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IDSQIIuPEeiu6boZkiJHCA" points="[547, 323, -643984, -643984]$[413, 323, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JT8mwIuPEeiu6boZkiJHCA" id="(0.0,0.5892857142857143)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JT8mwYuPEeiu6boZkiJHCA" id="(1.0,0.6290322580645161)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_SHRdkIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_SHRdk4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VL7hYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHRdlIuPEeiu6boZkiJHCA" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SHRdlYuPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VNUBcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHRdlouPEeiu6boZkiJHCA" x="4" y="11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SHRdl4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VPGxMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEoIuPEeiu6boZkiJHCA" x="50" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SHSEoYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VRQGQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEoouPEeiu6boZkiJHCA" x="-36" y="-12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SHSEo4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VTbQgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEpIuPEeiu6boZkiJHCA" x="8" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_SHSEpYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VVa0kIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEpouPEeiu6boZkiJHCA" x="-9" y="9"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_SHRdkYuPEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_B3JLoEHCEeWqPKyD1j6LMg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SHRdkouPEeiu6boZkiJHCA" points="[859, 341, -643984, -643984]$[859, 387, -643984, -643984]$[397, 387, -643984, -643984]$[397, 346, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKNDEIuPEeiu6boZkiJHCA" id="(0.10526315789473684,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKNDEYuPEeiu6boZkiJHCA" id="(0.9411764705882353,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_ZtSzwIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa0IuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a5-CQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa0YuPEeiu6boZkiJHCA" x="2" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa0ouPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a7VUMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa04uPEeiu6boZkiJHCA" x="-2" y="9"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa1IuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a8rYAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa1YuPEeiu6boZkiJHCA" x="8" y="24"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa1ouPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a-D4EIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa14uPEeiu6boZkiJHCA" x="-60" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa2IuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a_gpkIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa2YuPEeiu6boZkiJHCA" x="9" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa2ouPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bBeYcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa24uPEeiu6boZkiJHCA" x="-10" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_ZtSzwYuPEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZtSzwouPEeiu6boZkiJHCA" points="[371, 346, -643984, -643984]$[371, 408, -643984, -643984]$[912, 408, -643984, -643984]$[912, 341, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a4VqkIuPEeiu6boZkiJHCA" id="(0.8392156862745098,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a4WRoIuPEeiu6boZkiJHCA" id="(0.4152046783625731,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_ihLEMIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEM4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jik20IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLENIuPEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ihLENYuPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jj4eYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLENouPEeiu6boZkiJHCA" x="77" y="10"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEN4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jlOiMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEOIuPEeiu6boZkiJHCA" x="96" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEOYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jmmbMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEOouPEeiu6boZkiJHCA" x="-96" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEO4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jn738IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEPIuPEeiu6boZkiJHCA" x="9" y="12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEPYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jpPfgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEPouPEeiu6boZkiJHCA" x="-8" y="12"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_ihLEMYuPEeiu6boZkiJHCA"/>
+      <element href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ihLEMouPEeiu6boZkiJHCA" points="[816, 346, -643984, -643984]$[816, 456, -643984, -643984]$[312, 456, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jgqLQIuPEeiu6boZkiJHCA" id="(0.672514619883041,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jgqLQYuPEeiu6boZkiJHCA" id="(1.0,0.5)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_WJr-UJ_AEeiO_KvaRsULdw" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="255">
+      <children xsi:type="notation:DecorationNode" xmi:id="_WJslYJ_AEeiO_KvaRsULdw" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jdTwgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJslYZ_AEeiO_KvaRsULdw" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMcJ_AEeiO_KvaRsULdw" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jfgI4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMcZ_AEeiO_KvaRsULdw" x="2" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMcp_AEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jhu9gJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMc5_AEeiO_KvaRsULdw" x="15" y="-82"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMdJ_AEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jj3EcJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMdZ_AEeiO_KvaRsULdw" x="-77" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMdp_AEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jmgIwJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMd5_AEeiO_KvaRsULdw" x="8" y="17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMeJ_AEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jpfLUJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMeZ_AEeiO_KvaRsULdw" x="-11" y="10"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_WJr-UZ_AEeiO_KvaRsULdw"/>
+      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_WJr-Up_AEeiO_KvaRsULdw" points="[280, 346, -643984, -643984]$[280, 373, -643984, -643984]$[170, 373, -643984, -643984]$[170, 346, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a4aXQJ_AEeiO_KvaRsULdw" id="(0.4823529411764706,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a2SQUJ_AEeiO_KvaRsULdw" id="(0.047058823529411764,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_snmgYJ_BEeiO_KvaRsULdw" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear" lineColor="255">
+      <children xsi:type="notation:DecorationNode" xmi:id="_snmgY5_BEeiO_KvaRsULdw" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x8HuAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_snmgZJ_BEeiO_KvaRsULdw" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_snnHcJ_BEeiO_KvaRsULdw" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x--NsJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHcZ_BEeiO_KvaRsULdw" x="15" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_snnHcp_BEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yA2dAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHc5_BEeiO_KvaRsULdw" x="93" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_snnHdJ_BEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yCsQEJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHdZ_BEeiO_KvaRsULdw" x="-93" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_snnHdp_BEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yEoJwJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHd5_BEeiO_KvaRsULdw" x="10" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_snnHeJ_BEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yGcusJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHeZ_BEeiO_KvaRsULdw" x="-11" y="18"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_snmgYZ_BEeiO_KvaRsULdw"/>
+      <element href="TapiConnectivity.uml#_sWjMoJ_BEeiO_KvaRsULdw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_snmgYp_BEeiO_KvaRsULdw" points="[426, 65, -643984, -643984]$[426, 108, -643984, -643984]$[618, 108, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_stZmYJ_BEeiO_KvaRsULdw" id="(0.875,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_staNcJ_BEeiO_KvaRsULdw" id="(0.0,0.5084745762711864)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_8gn2QKSdEeiKJbr6a5Jjpg" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2Q6SdEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_99gD8KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2RKSdEeiKJbr6a5Jjpg" y="-20"/>
+    <edges xsi:type="notation:Connector" xmi:id="_8gn2QKSdEeiKJbr6a5Jjpg" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2Q6SdEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_99gD8KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2RKSdEeiKJbr6a5Jjpg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2RaSdEeiKJbr6a5Jjpg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9_YTQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2RqSdEeiKJbr6a5Jjpg" x="20" y="30"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2RaSdEeiKJbr6a5Jjpg" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9_YTQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2RqSdEeiKJbr6a5Jjpg" x="20" y="30"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2R6SdEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-BaTkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2SKSdEeiKJbr6a5Jjpg" x="46" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2R6SdEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-BaTkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2SKSdEeiKJbr6a5Jjpg" x="46" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2SaSdEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-DjooKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2SqSdEeiKJbr6a5Jjpg" x="-46" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2SaSdEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-DjooKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2SqSdEeiKJbr6a5Jjpg" x="-46" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2S6SdEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-F2HoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2TKSdEeiKJbr6a5Jjpg" x="7" y="18"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2S6SdEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-F2HoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2TKSdEeiKJbr6a5Jjpg" x="7" y="18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2TaSdEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-HrToKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2TqSdEeiKJbr6a5Jjpg" x="-10" y="11"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2TaSdEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-HrToKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2TqSdEeiKJbr6a5Jjpg" x="-10" y="11"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_8gn2QaSdEeiKJbr6a5Jjpg"/>
-      <element xmi:type="uml:Association" href="TapiTopology.uml#_G1pfMNnfEeWIOYiRCk5bbQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8gn2QqSdEeiKJbr6a5Jjpg" points="[1012, 309, -643984, -643984]$[1055, 309, -643984, -643984]$[1055, 370, -643984, -643984]$[988, 370, -643984, -643984]$[988, 341, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96a6wKSdEeiKJbr6a5Jjpg" id="(1.0,0.49206349206349204)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96bh0KSdEeiKJbr6a5Jjpg" id="(0.8596491228070176,1.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_8gn2QaSdEeiKJbr6a5Jjpg"/>
+      <element href="TapiTopology.uml#_G1pfMNnfEeWIOYiRCk5bbQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8gn2QqSdEeiKJbr6a5Jjpg" points="[1012, 309, -643984, -643984]$[1055, 309, -643984, -643984]$[1055, 370, -643984, -643984]$[988, 370, -643984, -643984]$[988, 341, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_96a6wKSdEeiKJbr6a5Jjpg" id="(1.0,0.49206349206349204)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_96bh0KSdEeiKJbr6a5Jjpg" id="(0.8596491228070176,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wheqx6avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU0MDBGEeam35bpdXJzEw" target="_wheqw6avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wheqyKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wheqzKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XcgXlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0MDBGEeam35bpdXJzEw" target="_XcgXkKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XcgXlasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XcgXmasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wheqyaavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wheqyqavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wheqy6avEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XcgXlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XcgXl6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XcgXmKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_whl_hKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_SVZ1oIuOEeiu6boZkiJHCA" target="_whl_gKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_whl_haavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whl_iaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xc5ZJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SVZ1oIuOEeiu6boZkiJHCA" target="_Xc5ZIKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xc6AMKsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xc6ANKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_whl_hqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whl_h6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whl_iKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xc6AMasnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xc6AMqsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xc6AM6snEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_whxltKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YeNm8IuOEeiu6boZkiJHCA" target="_whxlsKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_whxltaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_whxluaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XdGNdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_YeNm8IuOEeiu6boZkiJHCA" target="_XdGNcKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XdGNdasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdGNeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_whxltqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whxlt6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_whxluKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XdGNdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdGNd6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdGNeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wiLOVKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU0cTBGEeam35bpdXJzEw" target="_wiLOUKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wiLOVaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiLOWaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XdpnFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0cTBGEeam35bpdXJzEw" target="_XdpnEKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XdpnFasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdpnGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wiLOVqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiLOV6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiLOWKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XdpnFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdpnF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdpnGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wiWNdKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_jFNa0IuOEeiu6boZkiJHCA" target="_wiWNcKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wiWNdaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiWNeaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XeCBlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_jFNa0IuOEeiu6boZkiJHCA" target="_XeCBkKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XeCBlasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XeCooqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wiWNdqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiWNd6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiWNeKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XeCBlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XeCooKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XeCooasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_widiNKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_mliuAIuOEeiu6boZkiJHCA" target="_widiMKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_widiNaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_widiOaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XePc9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_mliuAIuOEeiu6boZkiJHCA" target="_XePc8KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XePc9asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XePc-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_widiNqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_widiN6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_widiOKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XePc9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XePc96snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XePc-KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wiqWhKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU0sjBGEeam35bpdXJzEw" target="_wiqWgKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wiqWhaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wiqWiaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xe49MasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0sjBGEeam35bpdXJzEw" target="_Xe4WIKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xe49MqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xe49NqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wiqWhqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiqWh6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wiqWiKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xe49M6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xe49NKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xe49NasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wi3K1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU1BDBGEeam35bpdXJzEw" target="_wi3K0KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wi3K1aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wi3K2aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XfokFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU1BDBGEeam35bpdXJzEw" target="_XfokEKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XfokFasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XfokGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wi3K1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wi3K16avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wi3K2KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XfokFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XfokF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XfokGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wjKFxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU1WTBGEeam35bpdXJzEw" target="_wjKFwKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wjKFxaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjKFyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XgW81KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU1WTBGEeam35bpdXJzEw" target="_XgW80KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XgW81asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XgW82asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjKFxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjKFx6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjKFyKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XgW81qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XgW816snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XgW82KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wjZWVKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU16TBGEeam35bpdXJzEw" target="_wjZWUKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wjZWVaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjZWWaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xg36NKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU16TBGEeam35bpdXJzEw" target="_Xg36MKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xg36NasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xg36OasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjZWVqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjZWV6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjZWWKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xg36NqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xg36N6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xg36OKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wjigRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU2QjBGEeam35bpdXJzEw" target="_wjigQKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wjigRaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjigSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XhZepKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU2QjBGEeam35bpdXJzEw" target="_XhZeoKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XhZepasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XhZeqasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjigRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjigR6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjigSKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XhZepqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XhZep6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XhZeqKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wjs4V6avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU2tzBGEeam35bpdXJzEw" target="_wjs4U6avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wjs4WKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wjs4XKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xh7qJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU2tzBGEeam35bpdXJzEw" target="_Xh7qIKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xh7qJasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xh7qKasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wjs4WaavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjs4WqavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wjs4W6avEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xh7qJqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xh7qJ6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xh7qKKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wj3QZKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BlU3KDBGEeam35bpdXJzEw" target="_wj3QYKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wj3QZaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj3QaaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XicnhKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU3KDBGEeam35bpdXJzEw" target="_XicngKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XicnhasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XicniasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wj3QZqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj3QZ6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj3QaKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XicnhqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xicnh6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XicniKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wj9-FKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_unw4AIuOEeiu6boZkiJHCA" target="_wj9-EKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wj9-FaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wj9-GaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xiu7ZKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_unw4AIuOEeiu6boZkiJHCA" target="_Xiu7YKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xiu7ZasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xiu7aasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wj9-FqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj9-F6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj9-GKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xiu7ZqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xiu7Z6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xiu7aKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wkHIBKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__VTMUIuOEeiu6boZkiJHCA" target="_wkHIAKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wkHIBaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkHICaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xi5TdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__VTMUIuOEeiu6boZkiJHCA" target="_Xi5TcKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xi5TdasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xi5TeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkHIBqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkHIB6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkHICKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xi5TdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xi5Td6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xi5TeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wkSHJKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_e4LtYMhsEeaVlemTikmRHw" target="_wkSHIKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wkSHJaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkSHKaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XjWmcasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_e4LtYMhsEeaVlemTikmRHw" target="_XjV_YKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XjWmcqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjWmdqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkSHJqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkSHJ6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkSHKKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XjWmc6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjWmdKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjWmdasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wkYNxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EYfToBM4Eee0L_IMWjydgQ" target="_wkYNwKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wkYNxaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkYNyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XjmeFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EYfToBM4Eee0L_IMWjydgQ" target="_XjmeEKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XjmeFasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjmeGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkYNxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkYNx6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkYNyKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XjmeFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjmeF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjmeGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wkdGRKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_9msK4IuNEeiu6boZkiJHCA" target="_wkdGQKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wkdGRaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkdGSaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XjwPEasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_9msK4IuNEeiu6boZkiJHCA" target="_XjvoAKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XjwPEqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjwPFqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkdGRqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkdGR6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkdGSKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XjwPE6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjwPFKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjwPFasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wkjM4KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ExLboIuOEeiu6boZkiJHCA" target="_wkil0KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wkjM4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wkjM5aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xj6nJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ExLboIuOEeiu6boZkiJHCA" target="_Xj6nIKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xj6nJasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xj6nKasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wkjM4qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkjM46avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wkjM5KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xj6nJqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xj6nJ6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xj6nKKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wksW16avEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_luMgoBMjEee0L_IMWjydgQ" target="_wksW06avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wksW2KavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wksW3KavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XkX6JKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_luMgoBMjEee0L_IMWjydgQ" target="_XkX6IKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XkX6JasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XkX6KasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wksW2aavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wksW2qavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wksW26avEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XkX6JqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XkX6J6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XkX6KKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wk4kFKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_6_LyABMjEee0L_IMWjydgQ" target="_wk4kEKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wk4kFaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk4kGaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XlDPlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_6_LyABMjEee0L_IMWjydgQ" target="_XlDPkKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XlDPlasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlDPmasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wk4kFqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk4kF6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk4kGKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XlDPlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlDPl6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlDPmKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wk_RxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_yv1goIuOEeiu6boZkiJHCA" target="_wk_RwKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wk_RxaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wk_RyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XlVjdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_yv1goIuOEeiu6boZkiJHCA" target="_XlVjcKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XlVjdasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlVjeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wk_RxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk_Rx6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wk_RyKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XlVjdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlVjd6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlVjeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wlGmhKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4u1OoIuOEeiu6boZkiJHCA" target="_wlGmgKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wlGmhaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlGmiaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_Xlf7hKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_4u1OoIuOEeiu6boZkiJHCA" target="_Xlf7gKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Xlf7hasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xlf7iasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlGmhqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlGmh6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlGmiKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xlf7hqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xlf7h6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xlf7iKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wlSzxKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GbpwIBM2Eee0L_IMWjydgQ" target="_wlSzwKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wlSzxaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlSzyaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XmSltKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_GbpwIBM2Eee0L_IMWjydgQ" target="_XmSlsKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XmSltasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XmSluasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlSzxqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlSzx6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlSzyKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XmSltqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XmSlt6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XmSluKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wldy5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_wldy4KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wldy5aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wldy6aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XnCMkKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_XnA-cKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XnCMkasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnCMlasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wldy5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wldy56avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wldy6KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnCMkqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnCMk6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnCMlKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wlj5hKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_XDTqEHIZEeeSiaQ95-6r9w" target="_wlj5gKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wlj5haavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlj5iaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XnQ2FKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_XDTqEHIZEeeSiaQ95-6r9w" target="_XnQ2EKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XnQ2FasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnQ2GasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlj5hqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlj5h6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlj5iKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnQ2FqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnQ2F6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnQ2GKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wlnj5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_IDRpEIuPEeiu6boZkiJHCA" target="_wlnj4KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wlnj5aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wloK8qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XnXjxKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_IDRpEIuPEeiu6boZkiJHCA" target="_XnXjwKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XnXjxasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnXjyasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlnj5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wloK8KavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wloK8aavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnXjxqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnXjx6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnXjyKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wlzxIKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3YdyUKLTEeeG6K0eZHmVww" target="_wlzKE6avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wlzxIaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wlzxJaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XnxzdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3YdyUKLTEeeG6K0eZHmVww" target="_XnxzcKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XnxzdasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnxzeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wlzxIqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlzxI6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wlzxJKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnxzdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xnxzd6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnxzeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wl6e1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DXw14KLUEeeG6K0eZHmVww" target="_wl6e0KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wl6e1aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl6e2aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XoAc9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DXw14KLUEeeG6K0eZHmVww" target="_XoAc8KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XoAc9asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoAc-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wl6e1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl6e16avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl6e2KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XoAc9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoAc96snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoAc-KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_wl_XVKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_szL8AIuOEeiu6boZkiJHCA" target="_wl_XUKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_wl_XVaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wl_XWaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_XoIYxKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_szL8AIuOEeiu6boZkiJHCA" target="_XoIYwKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_XoIYxasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoI_0qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wl_XVqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl_XV6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wl_XWKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XoIYxqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoI_0KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoI_0asnEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_Hdao8DBGEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="EndPointDetails" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_LsrifDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_LsrifTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LsrifjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LsrifzBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrigDBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_8F9eEKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F9eEaSeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F-FIKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-FIaSeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F-FIqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-FI6SeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F-sMKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sMaSeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F-sNKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sNaSeEeiKJbr6a5Jjpg"/>
+    <children xsi:type="notation:Shape" xmi:id="_LsrifDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_LsrifTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LsrifjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LsrifzBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrigDBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_8F9eEKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F9eEaSeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_8F-FIKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-FIaSeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_8F-FIqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-FI6SeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_8F-sMKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sMaSeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_8F-sNKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sNaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F-sNqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sN6SeEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_8F-sNqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sN6SeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F-sOKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sOaSeEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_8F-sOKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sOaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F_TQKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TQaSeEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_8F_TQKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TQaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F_TQqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TQ6SeEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_8F_TQqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TQ6SeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F_TRKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TRaSeEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_8F_TRKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TRaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8F_TRqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TR6SeEeiKJbr6a5Jjpg"/>
+        <children xsi:type="notation:Shape" xmi:id="_8F_TRqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TR6SeEeiKJbr6a5Jjpg"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrjdjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrjdzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrjeDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjeTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrjdjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrjdzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrjeDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjeTBGEeam35bpdXJzEw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrjejBGEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrjezBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrjfDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrjfTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjfjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrjfzBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrjgDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrjgTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrjgjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjgzBGEeam35bpdXJzEw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrjejBGEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrjezBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrjfDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrjfTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjfjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrjfzBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrjgDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrjgTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrjgjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjgzBGEeam35bpdXJzEw"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjsTBGEeam35bpdXJzEw" x="-55" y="42" width="435" height="233"/>
+      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjsTBGEeam35bpdXJzEw" x="-55" y="42" width="435" height="233"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_LsrjxjBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_LsrjxzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_LsrjyDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LsrjyTBGEeam35bpdXJzEw" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_LsrjxjBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_LsrjxzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_LsrjyDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_LsrjyTBGEeam35bpdXJzEw" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrjyjBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_LsrjyzBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_TlA2g979EeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Lsrj6jBGEeam35bpdXJzEw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Lsrj6zBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_TlA2hN79EeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LsrkCjBGEeam35bpdXJzEw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrkCzBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrkDDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrkDTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkDjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrkDzBGEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrkEDBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrkETBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrkEjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkEzBGEeam35bpdXJzEw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrkFDBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrkFTBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrkFjBGEeam35bpdXJzEw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrkFzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkGDBGEeam35bpdXJzEw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkRjBGEeam35bpdXJzEw" x="612" y="92" height="75"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrjyjBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_LsrjyzBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_TlA2g979EeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_Lsrj6jBGEeam35bpdXJzEw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_Lsrj6zBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_TlA2hN79EeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_LsrkCjBGEeam35bpdXJzEw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrkCzBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrkDDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrkDTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkDjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrkDzBGEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrkEDBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrkETBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrkEjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkEzBGEeam35bpdXJzEw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrkFDBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrkFTBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrkFjBGEeam35bpdXJzEw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrkFzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkGDBGEeam35bpdXJzEw"/>
+      </children>
+      <element href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkRjBGEeam35bpdXJzEw" x="612" y="92" height="75"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__g_RQzIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="__g_RRDIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__g_RRjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="ecore:EObject" href="TapiCommon.uml#_VZkuoC6BEea0_JngOlSKcA"/>
+    <children xsi:type="notation:Shape" xmi:id="__g_RQzIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="__g_RRDIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__g_RRjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_VZkuoC6BEea0_JngOlSKcA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__g_RRTIvEeamvfKYyWmELQ" x="591" y="597"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__g_RRTIvEeamvfKYyWmELQ" x="591" y="597"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__hSMPzIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="__hSMQDIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__hSMQjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xsi:type="notation:Shape" xmi:id="__hSMPzIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="__hSMQDIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__hSMQjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__hSMQTIvEeamvfKYyWmELQ" x="731" y="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__iLkJDIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="__iLkJTIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__iLkJzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__iLkJjIvEeamvfKYyWmELQ" x="880" y="-5"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_rT034EwEEeewALXL7BvPYw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_rT1e8EwEEeewALXL7BvPYw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rT1e8UwEEeewALXL7BvPYw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rT1e8kwEEeewALXL7BvPYw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rT1e80wEEeewALXL7BvPYw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_9_v1IIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_v1IYoOEeivCevppATXng"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_wcMIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_wcMYoOEeivCevppATXng"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__hSMQTIvEeamvfKYyWmELQ" x="731" y="141"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="__iLkJDIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="__iLkJTIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__iLkJzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__iLkJjIvEeamvfKYyWmELQ" x="880" y="-5"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_rT034EwEEeewALXL7BvPYw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_rT1e8EwEEeewALXL7BvPYw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rT1e8UwEEeewALXL7BvPYw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rT1e8kwEEeewALXL7BvPYw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rT1e80wEEeewALXL7BvPYw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_9_v1IIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_v1IYoOEeivCevppATXng"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_9_wcMIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_wcMYoOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_y4cIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4cYoOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_y4cIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4cYoOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_y4cooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4c4oOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_y4cooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4c4oOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_y4dIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4dYoOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_y4dIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4dYoOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_y4dooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4d4oOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_y4dooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4d4oOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_zfgIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfgYoOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_zfgIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfgYoOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_zfgooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfg4oOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_zfgooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfg4oOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_zfhIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfhYoOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_zfhIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfhYoOEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_zfhooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfh4oOEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_9_zfhooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfh4oOEeivCevppATXng"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rT1e9EwEEeewALXL7BvPYw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rT1e9UwEEeewALXL7BvPYw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rT1e9kwEEeewALXL7BvPYw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT1e90wEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rT1e9EwEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rT1e9UwEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rT1e9kwEEeewALXL7BvPYw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT1e90wEEeewALXL7BvPYw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rT1e-EwEEeewALXL7BvPYw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rT1e-UwEEeewALXL7BvPYw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rT1e-kwEEeewALXL7BvPYw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rT1e-0wEEeewALXL7BvPYw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT1e_EwEEeewALXL7BvPYw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rT1e-EwEEeewALXL7BvPYw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rT1e-UwEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rT1e-kwEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rT1e-0wEEeewALXL7BvPYw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT1e_EwEEeewALXL7BvPYw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rT1e_UwEEeewALXL7BvPYw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rT1e_kwEEeewALXL7BvPYw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rT1e_0wEEeewALXL7BvPYw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rT1fAEwEEeewALXL7BvPYw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT1fAUwEEeewALXL7BvPYw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rT1e_UwEEeewALXL7BvPYw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rT1e_kwEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rT1e_0wEEeewALXL7BvPYw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rT1fAEwEEeewALXL7BvPYw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT1fAUwEEeewALXL7BvPYw"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT034UwEEeewALXL7BvPYw" x="11" y="354" width="306" height="196"/>
+      <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT034UwEEeewALXL7BvPYw" x="11" y="354" width="306" height="196"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rT-o4EwEEeewALXL7BvPYw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rT-o4UwEEeewALXL7BvPYw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rT-o40wEEeewALXL7BvPYw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_rT-o4EwEEeewALXL7BvPYw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_rT-o4UwEEeewALXL7BvPYw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rT-o40wEEeewALXL7BvPYw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT-o4kwEEeewALXL7BvPYw" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT-o4kwEEeewALXL7BvPYw" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_n4MtoMZaEeeAD9H5zOiMUQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_n4NUscZaEeeAD9H5zOiMUQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_n4NUssZaEeeAD9H5zOiMUQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_n4NUs8ZaEeeAD9H5zOiMUQ" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="_n4MtoMZaEeeAD9H5zOiMUQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_n4NUscZaEeeAD9H5zOiMUQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_n4NUssZaEeeAD9H5zOiMUQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_n4NUs8ZaEeeAD9H5zOiMUQ" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_n4NUtMZaEeeAD9H5zOiMUQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_o6nz8MZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_7n4Ucqg2EeeAVfY3jqnvAA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_o6nz8cZaEeeAD9H5zOiMUQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_n4NUtMZaEeeAD9H5zOiMUQ" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_o6nz8MZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_7n4Ucqg2EeeAVfY3jqnvAA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_o6nz8cZaEeeAD9H5zOiMUQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_o6obAMZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_7n4Udqg2EeeAVfY3jqnvAA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_o6obAcZaEeeAD9H5zOiMUQ"/>
+        <children xsi:type="notation:Shape" xmi:id="_o6obAMZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_7n4Udqg2EeeAVfY3jqnvAA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_o6obAcZaEeeAD9H5zOiMUQ"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_n4NUtcZaEeeAD9H5zOiMUQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_n4NUtsZaEeeAD9H5zOiMUQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_n4NUt8ZaEeeAD9H5zOiMUQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUuMZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_n4NUtcZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_n4NUtsZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_n4NUt8ZaEeeAD9H5zOiMUQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUuMZaEeeAD9H5zOiMUQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_n4NUucZaEeeAD9H5zOiMUQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_n4NUusZaEeeAD9H5zOiMUQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_n4NUu8ZaEeeAD9H5zOiMUQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_n4NUvMZaEeeAD9H5zOiMUQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUvcZaEeeAD9H5zOiMUQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_n4NUucZaEeeAD9H5zOiMUQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_n4NUusZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_n4NUu8ZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_n4NUvMZaEeeAD9H5zOiMUQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUvcZaEeeAD9H5zOiMUQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_n4NUvsZaEeeAD9H5zOiMUQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_n4NUv8ZaEeeAD9H5zOiMUQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_n4NUwMZaEeeAD9H5zOiMUQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_n4NUwcZaEeeAD9H5zOiMUQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUwsZaEeeAD9H5zOiMUQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_n4NUvsZaEeeAD9H5zOiMUQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_n4NUv8ZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_n4NUwMZaEeeAD9H5zOiMUQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_n4NUwcZaEeeAD9H5zOiMUQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUwsZaEeeAD9H5zOiMUQ"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUsMZaEeeAD9H5zOiMUQ" x="608" y="191" height="84"/>
+      <element href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUsMZaEeeAD9H5zOiMUQ" x="608" y="191" height="84"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_n4UCY8ZaEeeAD9H5zOiMUQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_n4UCZMZaEeeAD9H5zOiMUQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_n4UpcMZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+    <children xsi:type="notation:Shape" xmi:id="_n4UCY8ZaEeeAD9H5zOiMUQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_n4UCZMZaEeeAD9H5zOiMUQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4UpcMZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4UCZcZaEeeAD9H5zOiMUQ" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4UCZcZaEeeAD9H5zOiMUQ" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_lf0UsIuREeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_lf0UsYuREeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lf0Us4uREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_lf0UsIuREeiu6boZkiJHCA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_lf0UsYuREeiu6boZkiJHCA"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_lf0Us4uREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lf0UsouREeiu6boZkiJHCA" x="145" y="-58"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lf0UsouREeiu6boZkiJHCA" x="145" y="-58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_oXd3Q4uREeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_oXd3RIuREeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oXeeUIuREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
+    <children xsi:type="notation:Shape" xmi:id="_oXd3Q4uREeiu6boZkiJHCA" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_oXd3RIuREeiu6boZkiJHCA"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oXeeUIuREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oXd3RYuREeiu6boZkiJHCA" x="145" y="-58"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oXd3RYuREeiu6boZkiJHCA" x="145" y="-58"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_Hdao8TBGEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_Hdao8jBGEeam35bpdXJzEw"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HZRRgIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_Hdao8TBGEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_Hdao8jBGEeam35bpdXJzEw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_HZRRgIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="__hSMQzIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrifDBGEeam35bpdXJzEw" target="__hSMPzIvEeamvfKYyWmELQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="__hSMRDIvEeamvfKYyWmELQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__hSMSDIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xsi:type="notation:Connector" xmi:id="__hSMQzIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrifDBGEeam35bpdXJzEw" target="__hSMPzIvEeamvfKYyWmELQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="__hSMRDIvEeamvfKYyWmELQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__hSMSDIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__hSMRTIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__hSMRjIvEeamvfKYyWmELQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__hSMRzIvEeamvfKYyWmELQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__hSMRTIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__hSMRjIvEeamvfKYyWmELQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__hSMRzIvEeamvfKYyWmELQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__iLkKDIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrjxjBGEeam35bpdXJzEw" target="__iLkJDIvEeamvfKYyWmELQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="__iLkKTIvEeamvfKYyWmELQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__iLkLTIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
+    <edges xsi:type="notation:Connector" xmi:id="__iLkKDIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrjxjBGEeam35bpdXJzEw" target="__iLkJDIvEeamvfKYyWmELQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="__iLkKTIvEeamvfKYyWmELQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__iLkLTIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__iLkKjIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__iLkKzIvEeamvfKYyWmELQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__iLkLDIvEeamvfKYyWmELQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__iLkKjIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__iLkKzIvEeamvfKYyWmELQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__iLkLDIvEeamvfKYyWmELQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rT-o5EwEEeewALXL7BvPYw" type="StereotypeCommentLink" source="_rT034EwEEeewALXL7BvPYw" target="_rT-o4EwEEeewALXL7BvPYw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rT-o5UwEEeewALXL7BvPYw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rT-o6UwEEeewALXL7BvPYw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_rT-o5EwEEeewALXL7BvPYw" type="StereotypeCommentLink" source="_rT034EwEEeewALXL7BvPYw" target="_rT-o4EwEEeewALXL7BvPYw">
+      <styles xsi:type="notation:FontStyle" xmi:id="_rT-o5UwEEeewALXL7BvPYw"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rT-o6UwEEeewALXL7BvPYw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rT-o5kwEEeewALXL7BvPYw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rT-o50wEEeewALXL7BvPYw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rT-o6EwEEeewALXL7BvPYw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rT-o5kwEEeewALXL7BvPYw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rT-o50wEEeewALXL7BvPYw"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rT-o6EwEEeewALXL7BvPYw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_n4UpccZaEeeAD9H5zOiMUQ" type="StereotypeCommentLink" source="_n4MtoMZaEeeAD9H5zOiMUQ" target="_n4UCY8ZaEeeAD9H5zOiMUQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_n4UpcsZaEeeAD9H5zOiMUQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_n4UpdsZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_n4UpccZaEeeAD9H5zOiMUQ" type="StereotypeCommentLink" source="_n4MtoMZaEeeAD9H5zOiMUQ" target="_n4UCY8ZaEeeAD9H5zOiMUQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_n4UpcsZaEeeAD9H5zOiMUQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4UpdsZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n4Upc8ZaEeeAD9H5zOiMUQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n4UpdMZaEeeAD9H5zOiMUQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n4UpdcZaEeeAD9H5zOiMUQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4Upc8ZaEeeAD9H5zOiMUQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4UpdMZaEeeAD9H5zOiMUQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4UpdcZaEeeAD9H5zOiMUQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_kIc5IIuREeiu6boZkiJHCA" type="Association_Edge" source="_rT034EwEEeewALXL7BvPYw" target="_LsrifDBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_kIc5I4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIc5JIuREeiu6boZkiJHCA" y="-20"/>
+    <edges xsi:type="notation:Connector" xmi:id="_kIc5IIuREeiu6boZkiJHCA" type="Association_Edge" source="_rT034EwEEeewALXL7BvPYw" target="_LsrifDBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_kIc5I4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIc5JIuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgMIuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgMYuREeiu6boZkiJHCA" x="1" y="1"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgMIuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgMYuREeiu6boZkiJHCA" x="1" y="1"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgMouREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgM4uREeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgMouREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgM4uREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgNIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgNYuREeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgNIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgNYuREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgNouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgN4uREeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgNouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgN4uREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgOIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgOYuREeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgOIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgOYuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_kIc5IYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kIc5IouREeiu6boZkiJHCA" points="[162, 354, -643984, -643984]$[164, 260, -643984, -643984]"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y9G9oJ-_EeiO_KvaRsULdw" id="(0.49885057471264366,1.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_kIc5IYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kIc5IouREeiu6boZkiJHCA" points="[162, 354, -643984, -643984]$[164, 260, -643984, -643984]"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y9G9oJ-_EeiO_KvaRsULdw" id="(0.49885057471264366,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_lfoHcIuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_n4MtoMZaEeeAD9H5zOiMUQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_lfoHc4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfougIuREeiu6boZkiJHCA" x="2" y="9"/>
+    <edges xsi:type="notation:Connector" xmi:id="_lfoHcIuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_n4MtoMZaEeeAD9H5zOiMUQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_lfoHc4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfougIuREeiu6boZkiJHCA" x="2" y="9"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lfougYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfougouREeiu6boZkiJHCA" x="-1" y="-9"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lfougYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfougouREeiu6boZkiJHCA" x="-1" y="-9"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lfoug4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouhIuREeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lfoug4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouhIuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lfouhYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouhouREeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lfouhYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouhouREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lfouh4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouiIuREeiu6boZkiJHCA" x="-23" y="16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lfouh4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouiIuREeiu6boZkiJHCA" x="-23" y="16"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lfouiYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouiouREeiu6boZkiJHCA" x="20" y="18"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_lfouiYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouiouREeiu6boZkiJHCA" x="20" y="18"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_lfoHcYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lfoHcouREeiu6boZkiJHCA" points="[380, 179, -643984, -643984]$[608, 209, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mxDTEIuREeiu6boZkiJHCA" id="(1.0,0.8068669527896996)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_lfoHcYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_lfoHcouREeiu6boZkiJHCA" points="[380, 179, -643984, -643984]$[608, 209, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_mxDTEIuREeiu6boZkiJHCA" id="(1.0,0.8068669527896996)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_lf0UtIuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_lfoHcIuREeiu6boZkiJHCA" target="_lf0UsIuREeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_lf0UtYuREeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lf0UuYuREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_lf0UtIuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_lfoHcIuREeiu6boZkiJHCA" target="_lf0UsIuREeiu6boZkiJHCA">
+      <styles xsi:type="notation:FontStyle" xmi:id="_lf0UtYuREeiu6boZkiJHCA"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_lf0UuYuREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lf0UtouREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lf0Ut4uREeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lf0UuIuREeiu6boZkiJHCA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_lf0UtouREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lf0Ut4uREeiu6boZkiJHCA"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lf0UuIuREeiu6boZkiJHCA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oXRC8IuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrjxjBGEeam35bpdXJzEw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_oXRC84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqAIuREeiu6boZkiJHCA" x="-3" y="10"/>
+    <edges xsi:type="notation:Connector" xmi:id="_oXRC8IuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrjxjBGEeam35bpdXJzEw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_oXRC84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqAIuREeiu6boZkiJHCA" x="-3" y="10"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqAYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqAouREeiu6boZkiJHCA" x="-6" y="-6"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqAYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqAouREeiu6boZkiJHCA" x="-6" y="-6"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqBIuREeiu6boZkiJHCA" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqBIuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqBouREeiu6boZkiJHCA" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqBouREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqCIuREeiu6boZkiJHCA" x="-24" y="17"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqCIuREeiu6boZkiJHCA" x="-24" y="17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqCouREeiu6boZkiJHCA" x="26" y="15"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqCouREeiu6boZkiJHCA" x="26" y="15"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_oXRC8YuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oXRC8ouREeiu6boZkiJHCA" points="[380, 142, -643984, -643984]$[612, 133, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pU-oYIuREeiu6boZkiJHCA" id="(1.0,0.3776824034334764)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_oXRC8YuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oXRC8ouREeiu6boZkiJHCA" points="[380, 142, -643984, -643984]$[612, 133, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pU-oYIuREeiu6boZkiJHCA" id="(1.0,0.3776824034334764)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oXeeUYuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_oXRC8IuREeiu6boZkiJHCA" target="_oXd3Q4uREeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_oXeeUouREeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oXeeVouREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_oXeeUYuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_oXRC8IuREeiu6boZkiJHCA" target="_oXd3Q4uREeiu6boZkiJHCA">
+      <styles xsi:type="notation:FontStyle" xmi:id="_oXeeUouREeiu6boZkiJHCA"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oXeeVouREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oXeeU4uREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oXeeVIuREeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oXeeVYuREeiu6boZkiJHCA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oXeeU4uREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oXeeVIuREeiu6boZkiJHCA"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oXeeVYuREeiu6boZkiJHCA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4kURYJ--EeiO_KvaRsULdw" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrifDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ4J--EeiO_KvaRsULdw" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FZQjgJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ4Z--EeiO_KvaRsULdw" x="1" y="-19"/>
+    <edges xsi:type="notation:Connector" xmi:id="_4kURYJ--EeiO_KvaRsULdw" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrifDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ4J--EeiO_KvaRsULdw" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FZQjgJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ4Z--EeiO_KvaRsULdw" x="1" y="-19"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ4p--EeiO_KvaRsULdw" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FcdBcJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ45--EeiO_KvaRsULdw" x="-1" y="-11"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ4p--EeiO_KvaRsULdw" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FcdBcJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ45--EeiO_KvaRsULdw" x="-1" y="-11"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ5J--EeiO_KvaRsULdw" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fe-J8J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ5Z--EeiO_KvaRsULdw" x="98" y="-18"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ5J--EeiO_KvaRsULdw" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fe-J8J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ5Z--EeiO_KvaRsULdw" x="98" y="-18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ5p--EeiO_KvaRsULdw" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FhvKEJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ55--EeiO_KvaRsULdw" x="7" y="-42"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ5p--EeiO_KvaRsULdw" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FhvKEJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ55--EeiO_KvaRsULdw" x="7" y="-42"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4kZw8J--EeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fj-lwJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZw8Z--EeiO_KvaRsULdw" x="12" y="18"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4kZw8J--EeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fj-lwJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZw8Z--EeiO_KvaRsULdw" x="12" y="18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_4kZw8p--EeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fm5W4J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZw85--EeiO_KvaRsULdw" x="-11" y="16"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_4kZw8p--EeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fm5W4J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZw85--EeiO_KvaRsULdw" x="-11" y="16"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_4kURYZ--EeiO_KvaRsULdw"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4kURYp--EeiO_KvaRsULdw" points="[221, 42, -643984, -643984]$[221, 17, -643984, -643984]$[361, 17, -643984, -643984]$[361, 42, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4rVfYJ--EeiO_KvaRsULdw" id="(0.6344827586206897,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4rVfYZ--EeiO_KvaRsULdw" id="(0.9563218390804598,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_4kURYZ--EeiO_KvaRsULdw"/>
+      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4kURYp--EeiO_KvaRsULdw" points="[221, 42, -643984, -643984]$[221, 17, -643984, -643984]$[361, 17, -643984, -643984]$[361, 42, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4rVfYJ--EeiO_KvaRsULdw" id="(0.6344827586206897,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4rVfYZ--EeiO_KvaRsULdw" id="(0.9563218390804598,0.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_l51YUOr0EeaeHOJw3lCT8A" type="PapyrusUMLClassDiagram" name="Resilience" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_rR8FcOr0EeaeHOJw3lCT8A" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_rSCMEOr0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rSCMEer0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rSCMEur0EeaeHOJw3lCT8A" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rSCME-r0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_p3HGgIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3HGgYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3HtkIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3HtkYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3HtkohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3Htk4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3IUoIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUoYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3IUoohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUo4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3IUpIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUpYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3IUpohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUp4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3IUqIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUqYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3I7sIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3I7sYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3I7sohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3I7s4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p3I7tIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3I7tYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rSCMFOr0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rSCMFer0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rSCMFur0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMF-r0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rSCMGOr0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rSCMGer0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rSCMGur0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rSCMG-r0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMHOr0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rSCMHer0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rSCMHur0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rSCMH-r0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rSCMIOr0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMIer0EeaeHOJw3lCT8A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rR8Fcer0EeaeHOJw3lCT8A" x="20" y="520" width="521" height="321"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_ryFlIOr0EeaeHOJw3lCT8A" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ryFlIur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ryFlI-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ryFlJOr0EeaeHOJw3lCT8A" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ryFlJer0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_e2HOkPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_hSkgNOseEealN7CdLT_GPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOkfKiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_e2HOkvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_KnJbVPIoEea79czpMf3AVQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOk_KiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_e2HOlPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_jwuBuuryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOlfKiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_e2HOlvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_jwuBwOryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOl_KiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_e2HOmPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_jwuBveryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOmfKiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_bbbI8BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_bbbI8RMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_bbbI8hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_bbbI8xMmEee0L_IMWjydgQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ryFlJur0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ryFlJ-r0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ryFlKOr0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlKer0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ryFlKur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ryFlK-r0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ryFlLOr0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ryFlLer0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlLur0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ryFlL-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ryFlMOr0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ryFlMer0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ryFlMur0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlM-r0EeaeHOJw3lCT8A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlIer0EeaeHOJw3lCT8A" x="706" y="481" width="516" height="241"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_s9Rl4Or0EeaeHOJw3lCT8A" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_s9Rl4ur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_s9Rl4-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_s9Rl5Or0EeaeHOJw3lCT8A" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_s9Rl5er0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_-tUJwPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_wpkK0O38EeaRONVEJOGI1g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-tUJwfIrEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_-tUJwvIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__L4hAusYEealN7CdLT_GPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-tUJw_IrEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_-tUJxPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_CpfldOsbEealN7CdLT_GPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-tUJxfIrEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_a1CowBNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_a1CowRNbEeiKtYjI8wVF7A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_a1DP0BNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_a1DP0RNbEeiKtYjI8wVF7A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_s9Rl5ur0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_s9Rl5-r0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_s9Rl6Or0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl6er0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_s9Rl6ur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_s9Rl6-r0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_s9Rl7Or0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_s9Rl7er0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl7ur0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_s9Rl7-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_s9Rl8Or0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_s9Rl8er0EeaeHOJw3lCT8A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_s9Rl8ur0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl8-r0EeaeHOJw3lCT8A"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl4er0EeaeHOJw3lCT8A" x="40" y="200" height="175"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_QjgYUOsSEealN7CdLT_GPw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Qjme8OsSEealN7CdLT_GPw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Qjme8esSEealN7CdLT_GPw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Qjme8usSEealN7CdLT_GPw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Qjme8-sSEealN7CdLT_GPw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_V1N2QPIoEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_V1N2QfIoEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_aZys0BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aZys0RMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_aZys0hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aZys0xMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_59vBIHJqEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_qqAYYHJqEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_59vBIXJqEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Qjme9OsSEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Qjme9esSEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Qjme9usSEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qjme9-sSEealN7CdLT_GPw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Qjme-OsSEealN7CdLT_GPw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Qjme-esSEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Qjme-usSEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Qjme--sSEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qjme_OsSEealN7CdLT_GPw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Qjme_esSEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Qjme_usSEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Qjme_-sSEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QjmfAOsSEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjmfAesSEealN7CdLT_GPw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjgYUesSEealN7CdLT_GPw" x="640" y="-140" width="461" height="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_W4xb0OsTEealN7CdLT_GPw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_W43icOsTEealN7CdLT_GPw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_W43icesTEealN7CdLT_GPw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_W43icusTEealN7CdLT_GPw" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_W43ic-sTEealN7CdLT_GPw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_r7GsgOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7GsgesbEealN7CdLT_GPw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_r7GsgusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7Gsg-sbEealN7CdLT_GPw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_r7H6oOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6oesbEealN7CdLT_GPw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_r7H6pOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6pesbEealN7CdLT_GPw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_r7H6pusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6p-sbEealN7CdLT_GPw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_r7H6qOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6qesbEealN7CdLT_GPw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ZbNksBMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZbNksRMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ZbNkshMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZbNksxMmEee0L_IMWjydgQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_W43idOsTEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_W43idesTEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_W43idusTEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43id-sTEealN7CdLT_GPw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_W43ieOsTEealN7CdLT_GPw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_W43ieesTEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_W43ieusTEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_W43ie-sTEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43ifOsTEealN7CdLT_GPw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_W43ifesTEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_W43ifusTEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_W43if-sTEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_W43igOsTEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43igesTEealN7CdLT_GPw"/>
-      </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W4xb0esTEealN7CdLT_GPw" x="80" y="-320" width="401" height="241"/>
+    <children xsi:type="notation:Shape" xmi:id="_rR8FcOr0EeaeHOJw3lCT8A" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_rSCMEOr0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_rSCMEer0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_rSCMEur0EeaeHOJw3lCT8A" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rSCME-r0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_p3HGgIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3HGgYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3HtkIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3HtkYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3HtkohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3Htk4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3IUoIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUoYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3IUoohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUo4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3IUpIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUpYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3IUpohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUp4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3IUqIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUqYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3I7sIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3I7sYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3I7sohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3I7s4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_p3I7tIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3I7tYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rSCMFOr0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rSCMFer0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rSCMFur0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rSCMF-r0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rSCMGOr0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rSCMGer0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rSCMGur0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rSCMG-r0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rSCMHOr0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_rSCMHer0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_rSCMHur0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_rSCMH-r0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_rSCMIOr0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rSCMIer0EeaeHOJw3lCT8A"/>
+      </children>
+      <element href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rR8Fcer0EeaeHOJw3lCT8A" x="20" y="520" width="521" height="321"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ryFlIOr0EeaeHOJw3lCT8A" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ryFlIur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ryFlI-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ryFlJOr0EeaeHOJw3lCT8A" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ryFlJer0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_e2HOkPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_hSkgNOseEealN7CdLT_GPw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOkfKiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2HOkvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_KnJbVPIoEea79czpMf3AVQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOk_KiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2HOlPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_jwuBuuryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOlfKiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2HOlvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_jwuBwOryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOl_KiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_e2HOmPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_jwuBveryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOmfKiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_bbbI8BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_bbbI8RMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_bbbI8hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_bbbI8xMmEee0L_IMWjydgQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ryFlJur0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ryFlJ-r0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ryFlKOr0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlKer0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ryFlKur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ryFlK-r0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ryFlLOr0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ryFlLer0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlLur0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ryFlL-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ryFlMOr0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ryFlMer0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ryFlMur0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlM-r0EeaeHOJw3lCT8A"/>
+      </children>
+      <element href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlIer0EeaeHOJw3lCT8A" x="706" y="481" width="516" height="241"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_s9Rl4Or0EeaeHOJw3lCT8A" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_s9Rl4ur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_s9Rl4-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_s9Rl5Or0EeaeHOJw3lCT8A" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_s9Rl5er0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_-tUJwPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_wpkK0O38EeaRONVEJOGI1g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_-tUJwfIrEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_-tUJwvIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#__L4hAusYEealN7CdLT_GPw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_-tUJw_IrEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_-tUJxPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_CpfldOsbEealN7CdLT_GPw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_-tUJxfIrEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_a1CowBNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_a1CowRNbEeiKtYjI8wVF7A"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_a1DP0BNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_a1DP0RNbEeiKtYjI8wVF7A"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_s9Rl5ur0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_s9Rl5-r0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_s9Rl6Or0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl6er0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_s9Rl6ur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_s9Rl6-r0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_s9Rl7Or0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_s9Rl7er0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl7ur0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_s9Rl7-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_s9Rl8Or0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_s9Rl8er0EeaeHOJw3lCT8A"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_s9Rl8ur0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl8-r0EeaeHOJw3lCT8A"/>
+      </children>
+      <element href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl4er0EeaeHOJw3lCT8A" x="40" y="200" height="175"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_QjgYUOsSEealN7CdLT_GPw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Qjme8OsSEealN7CdLT_GPw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Qjme8esSEealN7CdLT_GPw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Qjme8usSEealN7CdLT_GPw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Qjme8-sSEealN7CdLT_GPw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_V1N2QPIoEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_V1N2QfIoEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_aZys0BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_aZys0RMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_aZys0hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_aZys0xMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_59vBIHJqEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_qqAYYHJqEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_59vBIXJqEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Qjme9OsSEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Qjme9esSEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Qjme9usSEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Qjme9-sSEealN7CdLT_GPw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Qjme-OsSEealN7CdLT_GPw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Qjme-esSEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Qjme-usSEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Qjme--sSEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Qjme_OsSEealN7CdLT_GPw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Qjme_esSEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Qjme_usSEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Qjme_-sSEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_QjmfAOsSEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QjmfAesSEealN7CdLT_GPw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QjgYUesSEealN7CdLT_GPw" x="640" y="-140" width="461" height="141"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_W4xb0OsTEealN7CdLT_GPw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_W43icOsTEealN7CdLT_GPw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_W43icesTEealN7CdLT_GPw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_W43icusTEealN7CdLT_GPw" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_W43ic-sTEealN7CdLT_GPw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_r7GsgOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7GsgesbEealN7CdLT_GPw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_r7GsgusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7Gsg-sbEealN7CdLT_GPw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_r7H6oOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6oesbEealN7CdLT_GPw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_r7H6pOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6pesbEealN7CdLT_GPw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_r7H6pusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6p-sbEealN7CdLT_GPw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_r7H6qOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6qesbEealN7CdLT_GPw"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_ZbNksBMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ZbNksRMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_ZbNkshMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ZbNksxMmEee0L_IMWjydgQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_W43idOsTEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_W43idesTEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_W43idusTEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W43id-sTEealN7CdLT_GPw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_W43ieOsTEealN7CdLT_GPw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_W43ieesTEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_W43ieusTEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_W43ie-sTEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W43ifOsTEealN7CdLT_GPw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_W43ifesTEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_W43ifusTEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_W43if-sTEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_W43igOsTEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W43igesTEealN7CdLT_GPw"/>
+      </children>
+      <element href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W4xb0esTEealN7CdLT_GPw" x="80" y="-320" width="401" height="241"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jHqrg-scEealN7CdLT_GPw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jHqrhOscEealN7CdLT_GPw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHqrhuscEealN7CdLT_GPw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_jHqrg-scEealN7CdLT_GPw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_jHqrhOscEealN7CdLT_GPw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_jHqrhuscEealN7CdLT_GPw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHqrhescEealN7CdLT_GPw" x="742" y="-100"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jHqrhescEealN7CdLT_GPw" x="742" y="-100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__j6psOscEealN7CdLT_GPw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="__j6psuscEealN7CdLT_GPw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__j6ps-scEealN7CdLT_GPw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__j6ptOscEealN7CdLT_GPw" y="5"/>
+    <children xsi:type="notation:Shape" xmi:id="__j6psOscEealN7CdLT_GPw" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="__j6psuscEealN7CdLT_GPw" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="__j6ps-scEealN7CdLT_GPw" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__j6ptOscEealN7CdLT_GPw" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__j6ptescEealN7CdLT_GPw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_B6U0UIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6U0UYoPEeivCevppATXng"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__j6ptescEealN7CdLT_GPw" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_B6U0UIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6U0UYoPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6VbYIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbYYoPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6VbYIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbYYoPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6VbYooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_hHpeAHIzEeeSiaQ95-6r9w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbY4oPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6VbYooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_hHpeAHIzEeeSiaQ95-6r9w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbY4oPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6VbZIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbZYoPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6VbZIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbZYoPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6VbZooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbZ4oPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6VbZooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbZ4oPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6WCcIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCcYoPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6WCcIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCcYoPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6WCcooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCc4oPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6WCcooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCc4oPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6WCdIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCdYoPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6WCdIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCdYoPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6WCdooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCd4oPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6WCdooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCd4oPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6WpgIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WpgYoPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6WpgIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WpgYoPEeivCevppATXng"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_B6WpgooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6Wpg4oPEeivCevppATXng"/>
+        <children xsi:type="notation:Shape" xmi:id="_B6WpgooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6Wpg4oPEeivCevppATXng"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="__j6ptuscEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__j6pt-scEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__j6puOscEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6puescEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="__j6ptuscEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__j6pt-scEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__j6puOscEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6puescEealN7CdLT_GPw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__j6puuscEealN7CdLT_GPw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__j6pu-scEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__j6pvOscEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__j6pvescEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6pvuscEealN7CdLT_GPw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__j6puuscEealN7CdLT_GPw" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__j6pu-scEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__j6pvOscEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__j6pvescEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6pvuscEealN7CdLT_GPw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__j6pv-scEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__j6pwOscEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__j6pwescEealN7CdLT_GPw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__j6pwuscEealN7CdLT_GPw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6pw-scEealN7CdLT_GPw"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="__j6pv-scEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="__j6pwOscEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="__j6pwescEealN7CdLT_GPw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="__j6pwuscEealN7CdLT_GPw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6pw-scEealN7CdLT_GPw"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6psescEealN7CdLT_GPw" x="1260" y="-320" width="601" height="321"/>
+      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6psescEealN7CdLT_GPw" x="1260" y="-320" width="601" height="321"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hU2_M-seEealN7CdLT_GPw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_hU2_NOseEealN7CdLT_GPw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hU2_NuseEealN7CdLT_GPw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
+    <children xsi:type="notation:Shape" xmi:id="_hU2_M-seEealN7CdLT_GPw" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_hU2_NOseEealN7CdLT_GPw" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hU2_NuseEealN7CdLT_GPw" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hU2_NeseEealN7CdLT_GPw" x="538" y="25"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hU2_NeseEealN7CdLT_GPw" x="538" y="25"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wq5nk-38EeaRONVEJOGI1g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wq5nlO38EeaRONVEJOGI1g" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wq5nlu38EeaRONVEJOGI1g" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
+    <children xsi:type="notation:Shape" xmi:id="_wq5nk-38EeaRONVEJOGI1g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_wq5nlO38EeaRONVEJOGI1g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wq5nlu38EeaRONVEJOGI1g" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wq5nle38EeaRONVEJOGI1g" x="221" y="-89"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wq5nle38EeaRONVEJOGI1g" x="221" y="-89"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_sI850-4REeaRONVEJOGI1g" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_sI851O4REeaRONVEJOGI1g" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sI851u4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_sI850-4REeaRONVEJOGI1g" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_sI851O4REeaRONVEJOGI1g" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_sI851u4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sI851e4REeaRONVEJOGI1g" x="535" y="43"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_sI851e4REeaRONVEJOGI1g" x="535" y="43"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_SXpJ7PItEea79czpMf3AVQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_SXpJ7fItEea79czpMf3AVQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SXpJ7_ItEea79czpMf3AVQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
+    <children xsi:type="notation:Shape" xmi:id="_SXpJ7PItEea79czpMf3AVQ" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_SXpJ7fItEea79czpMf3AVQ" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SXpJ7_ItEea79czpMf3AVQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXpJ7vItEea79czpMf3AVQ" x="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SXpJ7vItEea79czpMf3AVQ" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_6FhDgPLAEeaAIfPpmDwI5Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6FhDgfLAEeaAIfPpmDwI5Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6FhDg_LAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
+    <children xsi:type="notation:Shape" xmi:id="_6FhDgPLAEeaAIfPpmDwI5Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_6FhDgfLAEeaAIfPpmDwI5Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6FhDg_LAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FhDgvLAEeaAIfPpmDwI5Q" x="713" y="-95"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6FhDgvLAEeaAIfPpmDwI5Q" x="713" y="-95"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_QYR48_LXEeaAIfPpmDwI5Q" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QYR49PLXEeaAIfPpmDwI5Q" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_QYR49vLXEeaAIfPpmDwI5Q" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_QYR48_LXEeaAIfPpmDwI5Q" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_QYR49PLXEeaAIfPpmDwI5Q" showTitle="true"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_QYR49vLXEeaAIfPpmDwI5Q" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QYR49fLXEeaAIfPpmDwI5Q" x="695" y="-111"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QYR49fLXEeaAIfPpmDwI5Q" x="695" y="-111"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_LmxJ0HJqEeq3NYg-TXSAxQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Lmxw4HJqEeq3NYg-TXSAxQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Lmxw4XJqEeq3NYg-TXSAxQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lmxw4nJqEeq3NYg-TXSAxQ" y="15"/>
+    <children xsi:type="notation:Shape" xmi:id="_LmxJ0HJqEeq3NYg-TXSAxQ" type="Class_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Lmxw4HJqEeq3NYg-TXSAxQ" type="Class_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Lmxw4XJqEeq3NYg-TXSAxQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Lmxw4nJqEeq3NYg-TXSAxQ" y="15"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw43JqEeq3NYg-TXSAxQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_kC0fYKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuEnJpEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kC0fYaZnEeqJcvXkREZ1XQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Lmxw43JqEeq3NYg-TXSAxQ" type="Class_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_kC0fYKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#__RAuEnJpEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_kC0fYaZnEeqJcvXkREZ1XQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_kC1GcKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuFXJpEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kC1GcaZnEeqJcvXkREZ1XQ"/>
+        <children xsi:type="notation:Shape" xmi:id="_kC1GcKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element href="TapiConnectivity.uml#__RAuFXJpEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_kC1GcaZnEeqJcvXkREZ1XQ"/>
         </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw5HJqEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw5XJqEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Lmxw5nJqEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw53JqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Lmxw5HJqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Lmxw5XJqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Lmxw5nJqEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lmxw53JqEeq3NYg-TXSAxQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw6HJqEeq3NYg-TXSAxQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw6XJqEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw6nJqEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Lmxw63JqEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw7HJqEeq3NYg-TXSAxQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Lmxw6HJqEeq3NYg-TXSAxQ" type="Class_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Lmxw6XJqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Lmxw6nJqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Lmxw63JqEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lmxw7HJqEeq3NYg-TXSAxQ"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw7XJqEeq3NYg-TXSAxQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw7nJqEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw73JqEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Lmxw8HJqEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw8XJqEeq3NYg-TXSAxQ"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Lmxw7XJqEeq3NYg-TXSAxQ" type="Class_NestedClassifierCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Lmxw7nJqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Lmxw73JqEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Lmxw8HJqEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lmxw8XJqEeq3NYg-TXSAxQ"/>
       </children>
-      <element xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LmxJ0XJqEeq3NYg-TXSAxQ" x="820" y="140" width="381" height="121"/>
+      <element href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LmxJ0XJqEeq3NYg-TXSAxQ" x="820" y="140" width="381" height="121"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w5ZbgKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w5ZbgaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w5aCkKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <children xsi:type="notation:Shape" xmi:id="_YMb_sKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YMb_sasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YMb_s6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5ZbgqavEeqJcvXkREZ1XQ" x="220" y="520"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YMb_sqsnEeqiJu55eR3W2w" x="220" y="520"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w6CUs6avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w6CUtKavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6C7wKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
+    <children xsi:type="notation:Shape" xmi:id="_YOTn8KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YOTn8asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YOTn86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w6CUtaavEeqJcvXkREZ1XQ" x="906" y="481"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YOTn8qsnEeqiJu55eR3W2w" x="906" y="481"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w6scAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w6scAaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6scA6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
+    <children xsi:type="notation:Shape" xmi:id="_YPf6wKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YPf6wasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YPf6w6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w6scAqavEeqJcvXkREZ1XQ" x="240" y="200"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YPf6wqsnEeqiJu55eR3W2w" x="240" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w7Ig4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w7Ig4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7Ig46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
+    <children xsi:type="notation:Shape" xmi:id="_YQRW0KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YQRW0asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQR94KsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7Ig4qavEeqJcvXkREZ1XQ" x="240" y="100"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YQRW0qsnEeqiJu55eR3W2w" x="240" y="100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w7POkKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w7POkaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7POk6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
+    <children xsi:type="notation:Shape" xmi:id="_YQYrkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YQYrkasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQYrk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7POkqavEeqJcvXkREZ1XQ" x="240" y="100"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YQYrkqsnEeqiJu55eR3W2w" x="240" y="100"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w7bb0KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w7bb0aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7bb06avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_YQv38KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YQv38asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQv386snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7bb0qavEeqJcvXkREZ1XQ" x="840" y="-140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YQv38qsnEeqiJu55eR3W2w" x="840" y="-140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w7vk4KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w7vk4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7vk46avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_YRYKEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YRYKEasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRYKE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7vk4qavEeqJcvXkREZ1XQ" x="840" y="-240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YRYKEqsnEeqiJu55eR3W2w" x="840" y="-240"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w8ADkKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w8ADkaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8ADk6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <children xsi:type="notation:Shape" xmi:id="_YRzA0KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YRzA0asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRzA06snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8ADkqavEeqJcvXkREZ1XQ" x="280" y="-320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YRzA0qsnEeqiJu55eR3W2w" x="280" y="-320"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w8cIcKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w8cIcaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8cIc6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
+    <children xsi:type="notation:Shape" xmi:id="_YS0UgKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YS0UgasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS07kKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8cIcqavEeqJcvXkREZ1XQ" x="280" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YS0UgqsnEeqiJu55eR3W2w" x="280" y="-420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w8kEQKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w8kEQaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8kEQ6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <children xsi:type="notation:Shape" xmi:id="_YS8QUKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YS8QUasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS8QU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8kEQqavEeqJcvXkREZ1XQ" x="280" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YS8QUqsnEeqiJu55eR3W2w" x="280" y="-420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w8qx8KavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w8qx8aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8qx86avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xsi:type="notation:Shape" xmi:id="_YTC-AKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YTC-AasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTC-A6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8qx8qavEeqJcvXkREZ1XQ" x="280" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YTC-AqsnEeqiJu55eR3W2w" x="280" y="-420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w81KAKavEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w81KAaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w81KA6avEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xsi:type="notation:Shape" xmi:id="_YTcmoKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YTcmoasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTcmo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w81KAqavEeqJcvXkREZ1XQ" x="1460" y="-320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YTcmoqsnEeqiJu55eR3W2w" x="1460" y="-320"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_w9kJ06avEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_w9kJ1KavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w9kJ1qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
+    <children xsi:type="notation:Shape" xmi:id="_YU7NUKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_YU7NUasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YU7NU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w9kJ1aavEeqJcvXkREZ1XQ" x="1020" y="140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YU7NUqsnEeqiJu55eR3W2w" x="1020" y="140"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_l51YUer0EeaeHOJw3lCT8A" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_l51YUur0EeaeHOJw3lCT8A"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Hz2UsIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_l51YUer0EeaeHOJw3lCT8A" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_l51YUur0EeaeHOJw3lCT8A"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_Hz2UsIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_sI851-4REeaRONVEJOGI1g" type="StereotypeCommentLink" target="_sI850-4REeaRONVEJOGI1g">
-      <styles xmi:type="notation:FontStyle" xmi:id="_sI852O4REeaRONVEJOGI1g"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sI853O4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sI852e4REeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sI852u4REeaRONVEJOGI1g"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sI852-4REeaRONVEJOGI1g"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_SXpJ8PItEea79czpMf3AVQ" type="StereotypeCommentLink" target="_SXpJ7PItEea79czpMf3AVQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_SXpJ8fItEea79czpMf3AVQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SXpJ9fItEea79czpMf3AVQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SXpJ8vItEea79czpMf3AVQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SXpJ8_ItEea79czpMf3AVQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SXpJ9PItEea79czpMf3AVQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_6FhqkPLAEeaAIfPpmDwI5Q" type="StereotypeCommentLink" target="_6FhDgPLAEeaAIfPpmDwI5Q">
-      <styles xmi:type="notation:FontStyle" xmi:id="_6FhqkfLAEeaAIfPpmDwI5Q"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6FhqlfLAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6FhqkvLAEeaAIfPpmDwI5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Fhqk_LAEeaAIfPpmDwI5Q"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6FhqlPLAEeaAIfPpmDwI5Q"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xaYCMIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_xaYpQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yVhwAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQYuREeiu6boZkiJHCA" x="-40" y="79"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xaYpQouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yY-FkKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQ4uREeiu6boZkiJHCA" x="-69" y="36"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xaYpRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ycsvAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpRYuREeiu6boZkiJHCA" x="36" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xaZQUIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ygXHAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQUYuREeiu6boZkiJHCA" x="-36" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xaZQUouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ykKo8KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQU4uREeiu6boZkiJHCA" x="24" y="-21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xaZQVIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yoXzgKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQVYuREeiu6boZkiJHCA" x="-23" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_xaYCMYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xaYCMouREeiu6boZkiJHCA" points="[320, -79, -643984, -643984]$[320, 200, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yTgCkIuREeiu6boZkiJHCA" id="(0.5985037406483791,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yyd2gIuREeiu6boZkiJHCA" id="(0.7368421052631579,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_zQcL8IuREeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_zQcL84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0vcgkIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczAIuREeiu6boZkiJHCA" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zQczAYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0yAsYIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczAouREeiu6boZkiJHCA" x="-5" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zQczA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0101YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczBIuREeiu6boZkiJHCA" x="-30" y="-56"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zQczBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_057SQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczBouREeiu6boZkiJHCA" x="-50" y="-42"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zQczB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0-MHMIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczCIuREeiu6boZkiJHCA" x="14" y="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zQczCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1B-bAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczCouREeiu6boZkiJHCA" x="-11" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_zQcL8YuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zQcL8ouREeiu6boZkiJHCA" points="[180, 200, -643984, -643984]$[180, 153, -643984, -643984]$[63, 153, -643984, -643984]$[63, 200, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0saasIuREeiu6boZkiJHCA" id="(0.5078947368421053,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0saasYuREeiu6boZkiJHCA" id="(0.0868421052631579,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_7buLUIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_7buyYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8bj3sIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyYYuREeiu6boZkiJHCA" x="-54" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7buyYouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8eblgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyY4uREeiu6boZkiJHCA" x="-54" y="-14"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7buyZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8g5qsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyZYuREeiu6boZkiJHCA" x="33" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7buyZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8jbaQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyZ4uREeiu6boZkiJHCA" x="-32" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7buyaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8nroIIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyaYuREeiu6boZkiJHCA" x="17" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7buyaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8rvBsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buya4uREeiu6boZkiJHCA" x="-10" y="-11"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_7buLUYuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7buLUouREeiu6boZkiJHCA" points="[481, -213, -643984, -643984]$[767, -213, -643984, -643984]$[767, -140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y1T0IuREeiu6boZkiJHCA" id="(1.0,0.43983402489626555)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y164IuREeiu6boZkiJHCA" id="(0.2754880694143167,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__1Uo0IuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="__1VP4IuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A-448IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP4YuREeiu6boZkiJHCA" x="-50" y="15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__1VP4ouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BBuxkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP44uREeiu6boZkiJHCA" x="-59" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__1VP5IuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BEoUkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP5YuREeiu6boZkiJHCA" x="90" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__1VP5ouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BHMgYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP54uREeiu6boZkiJHCA" x="-90" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__1VP6IuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BKIfoIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1V28IuREeiu6boZkiJHCA" x="9" y="-12"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__1V28YuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BMoaAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__1V28ouREeiu6boZkiJHCA" x="-24" y="-23"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__1Uo0YuREeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__1Uo0ouREeiu6boZkiJHCA" points="[481, -260, -643984, -643984]$[1260, -260, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEIuSEeiu6boZkiJHCA" id="(1.0,0.24896265560165975)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEYuSEeiu6boZkiJHCA" id="(0.0,0.18691588785046728)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_DVHJcIuSEeiu6boZkiJHCA" type="Association_Edge" source="__j6psOscEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwgIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FOZmUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwgYuSEeiu6boZkiJHCA" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwgouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FSdm8IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwg4uSEeiu6boZkiJHCA" x="20" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwhIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FU_WgIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwhYuSEeiu6boZkiJHCA" x="34" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwhouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FXkJYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwh4uSEeiu6boZkiJHCA" x="-36" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwiIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FaaCAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwiYuSEeiu6boZkiJHCA" x="22" y="-21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DVIXkIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fc7xkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVIXkYuSEeiu6boZkiJHCA" x="-8" y="22"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_DVHJcYuSEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DVHJcouSEeiu6boZkiJHCA" points="[1260, -220, -643984, -643984]$[920, -220, -643984, -643984]$[920, -140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsIuSEeiu6boZkiJHCA" id="(0.0,0.3115264797507788)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsYuSEeiu6boZkiJHCA" id="(0.6073752711496746,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_J7u4IIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_J7u4I4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LGCvIIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JIuSEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_J7u4JYuSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LIniAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JouSEeiu6boZkiJHCA" x="12" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_J7u4J4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LLhFAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4KIuSEeiu6boZkiJHCA" x="57" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_J7vfMIuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LOAYUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfMYuSEeiu6boZkiJHCA" x="-58" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_J7vfMouSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LRP5kIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfM4uSEeiu6boZkiJHCA" x="14" y="29"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_J7vfNIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LVWWcIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfNYuSEeiu6boZkiJHCA" x="-33" y="34"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_J7u4IYuSEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7u4IouSEeiu6boZkiJHCA" points="[1111, 481, -643984, -643984]$[1111, 323, -643984, -643984]$[1480, 323, -643984, -643984]$[1480, 1, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LChhEIuSEeiu6boZkiJHCA" id="(0.7771317829457365,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCiIIIuSEeiu6boZkiJHCA" id="(0.36605657237936773,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_NFTRIIuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_ryFlIOr0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_NFTRI4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OHDpEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MIuSEeiu6boZkiJHCA" x="-4" y="11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4MYuSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OJi8YIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MouSEeiu6boZkiJHCA" x="-61" y="-23"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4M4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OMbRQIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4NIuSEeiu6boZkiJHCA" x="34" y="-17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4NYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OO6kkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4NouSEeiu6boZkiJHCA" x="-31" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4N4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ORbtEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4OIuSEeiu6boZkiJHCA" x="14" y="16"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4OYuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OVqs0IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4OouSEeiu6boZkiJHCA" x="-16" y="15"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_NFTRIYuSEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NFTRIouSEeiu6boZkiJHCA" points="[322, 375, -643984, -643984]$[322, 461, -643984, -643984]$[619, 461, -643984, -643984]$[619, 601, -643984, -643984]$[706, 601, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwIuSEeiu6boZkiJHCA" id="(0.7421052631578947,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwYuSEeiu6boZkiJHCA" id="(0.0,0.4979253112033195)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_S68O0IuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_rR8FcOr0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_S6814IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xrdfUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6814YuSEeiu6boZkiJHCA" x="8" y="-2"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S6814ouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xvY9EKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68144uSEeiu6boZkiJHCA" x="-11"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S6815IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xzTzwKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6815YuSEeiu6boZkiJHCA" x="5" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S6815ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x3gXQKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68154uSEeiu6boZkiJHCA" x="-5" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S6816IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x7uI4KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6816YuSEeiu6boZkiJHCA" x="25" y="24"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_S6816ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yANnUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68164uSEeiu6boZkiJHCA" x="-21" y="26"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_S68O0YuSEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S68O0ouSEeiu6boZkiJHCA" points="[170, 168, -643984, -643984]$[160, 255, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaiZUIuSEeiu6boZkiJHCA" id="(0.21052631578947367,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UvwbYIuSEeiu6boZkiJHCA" id="(0.19193857965451055,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Wx-KwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v2L_wKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x0YuSEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v6OLMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x04uSEeiu6boZkiJHCA" x="48" y="-84"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v-UoEKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x1YuSEeiu6boZkiJHCA" x="24" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wCTwMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x14uSEeiu6boZkiJHCA" x="-24" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wGWisKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x2YuSEeiu6boZkiJHCA" x="20" y="-24"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wKSngKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x24uSEeiu6boZkiJHCA" x="-23" y="-26"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Wx-KwYuSEeiu6boZkiJHCA"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wx-KwouSEeiu6boZkiJHCA" points="[756, 481, -643984, -643984]$[756, 241, -643984, -643984]$[760, 241, -643984, -643984]$[760, 1, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gnApcHJqEeq3NYg-TXSAxQ" id="(0.10465116279069768,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YzgksIuSEeiu6boZkiJHCA" id="(0.2603036876355748,1.0)"/>
+    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_sI851-4REeaRONVEJOGI1g" type="StereotypeCommentLink" target="_sI850-4REeaRONVEJOGI1g">
+      <styles xsi:type="notation:FontStyle" xmi:id="_sI852O4REeaRONVEJOGI1g"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_sI853O4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_sI852e4REeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sI852u4REeaRONVEJOGI1g"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sI852-4REeaRONVEJOGI1g"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_SXpJ8PItEea79czpMf3AVQ" type="StereotypeCommentLink" target="_SXpJ7PItEea79czpMf3AVQ">
+      <styles xsi:type="notation:FontStyle" xmi:id="_SXpJ8fItEea79czpMf3AVQ"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SXpJ9fItEea79czpMf3AVQ" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SXpJ8vItEea79czpMf3AVQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SXpJ8_ItEea79czpMf3AVQ"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SXpJ9PItEea79czpMf3AVQ"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_6FhqkPLAEeaAIfPpmDwI5Q" type="StereotypeCommentLink" target="_6FhDgPLAEeaAIfPpmDwI5Q">
+      <styles xsi:type="notation:FontStyle" xmi:id="_6FhqkfLAEeaAIfPpmDwI5Q"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6FhqlfLAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_6FhqkvLAEeaAIfPpmDwI5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6Fhqk_LAEeaAIfPpmDwI5Q"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6FhqlPLAEeaAIfPpmDwI5Q"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_xaYCMIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_xaYpQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yVhwAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaYpQYuREeiu6boZkiJHCA" x="-40" y="79"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xaYpQouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yY-FkKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaYpQ4uREeiu6boZkiJHCA" x="-69" y="36"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xaYpRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ycsvAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaYpRYuREeiu6boZkiJHCA" x="36" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xaZQUIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ygXHAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaZQUYuREeiu6boZkiJHCA" x="-36" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xaZQUouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ykKo8KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaZQU4uREeiu6boZkiJHCA" x="24" y="-21"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xaZQVIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yoXzgKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaZQVYuREeiu6boZkiJHCA" x="-23" y="-16"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_xaYCMYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xaYCMouREeiu6boZkiJHCA" points="[320, -79, -643984, -643984]$[320, 200, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_yTgCkIuREeiu6boZkiJHCA" id="(0.5985037406483791,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_yyd2gIuREeiu6boZkiJHCA" id="(0.7368421052631579,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_zQcL8IuREeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_zQcL84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0vcgkIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczAIuREeiu6boZkiJHCA" x="1" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_zQczAYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0yAsYIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczAouREeiu6boZkiJHCA" x="-5" y="13"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_zQczA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0101YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczBIuREeiu6boZkiJHCA" x="-30" y="-56"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_zQczBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_057SQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczBouREeiu6boZkiJHCA" x="-50" y="-42"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_zQczB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0-MHMIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczCIuREeiu6boZkiJHCA" x="14" y="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_zQczCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_1B-bAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczCouREeiu6boZkiJHCA" x="-11" y="-13"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_zQcL8YuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_zQcL8ouREeiu6boZkiJHCA" points="[180, 200, -643984, -643984]$[180, 153, -643984, -643984]$[63, 153, -643984, -643984]$[63, 200, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0saasIuREeiu6boZkiJHCA" id="(0.5078947368421053,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0saasYuREeiu6boZkiJHCA" id="(0.0868421052631579,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_7buLUIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_7buyYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8bj3sIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyYYuREeiu6boZkiJHCA" x="-54" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7buyYouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8eblgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyY4uREeiu6boZkiJHCA" x="-54" y="-14"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7buyZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8g5qsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyZYuREeiu6boZkiJHCA" x="33" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7buyZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8jbaQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyZ4uREeiu6boZkiJHCA" x="-32" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7buyaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8nroIIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyaYuREeiu6boZkiJHCA" x="17" y="19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_7buyaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8rvBsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buya4uREeiu6boZkiJHCA" x="-10" y="-11"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_7buLUYuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7buLUouREeiu6boZkiJHCA" points="[481, -213, -643984, -643984]$[767, -213, -643984, -643984]$[767, -140, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8Y1T0IuREeiu6boZkiJHCA" id="(1.0,0.43983402489626555)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8Y164IuREeiu6boZkiJHCA" id="(0.2754880694143167,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="__1Uo0IuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="__1VP4IuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_A-448IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP4YuREeiu6boZkiJHCA" x="-50" y="15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__1VP4ouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BBuxkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP44uREeiu6boZkiJHCA" x="-59" y="-15"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__1VP5IuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BEoUkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP5YuREeiu6boZkiJHCA" x="90" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__1VP5ouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BHMgYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP54uREeiu6boZkiJHCA" x="-90" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__1VP6IuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BKIfoIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__1V28IuREeiu6boZkiJHCA" x="9" y="-12"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="__1V28YuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BMoaAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="__1V28ouREeiu6boZkiJHCA" x="-24" y="-23"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="__1Uo0YuREeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__1Uo0ouREeiu6boZkiJHCA" points="[481, -260, -643984, -643984]$[1260, -260, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_A6orEIuSEeiu6boZkiJHCA" id="(1.0,0.24896265560165975)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_A6orEYuSEeiu6boZkiJHCA" id="(0.0,0.18691588785046728)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_DVHJcIuSEeiu6boZkiJHCA" type="Association_Edge" source="__j6psOscEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwgIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FOZmUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwgYuSEeiu6boZkiJHCA" y="-19"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwgouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FSdm8IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwg4uSEeiu6boZkiJHCA" x="20" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwhIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FU_WgIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwhYuSEeiu6boZkiJHCA" x="34" y="-18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwhouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FXkJYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwh4uSEeiu6boZkiJHCA" x="-36" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwiIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FaaCAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwiYuSEeiu6boZkiJHCA" x="22" y="-21"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_DVIXkIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fc7xkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVIXkYuSEeiu6boZkiJHCA" x="-8" y="22"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_DVHJcYuSEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DVHJcouSEeiu6boZkiJHCA" points="[1260, -220, -643984, -643984]$[920, -220, -643984, -643984]$[920, -140, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FKfWsIuSEeiu6boZkiJHCA" id="(0.0,0.3115264797507788)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FKfWsYuSEeiu6boZkiJHCA" id="(0.6073752711496746,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_J7u4IIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_J7u4I4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LGCvIIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7u4JIuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_J7u4JYuSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LIniAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7u4JouSEeiu6boZkiJHCA" x="12" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_J7u4J4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LLhFAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7u4KIuSEeiu6boZkiJHCA" x="57" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_J7vfMIuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LOAYUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7vfMYuSEeiu6boZkiJHCA" x="-58" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_J7vfMouSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LRP5kIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7vfM4uSEeiu6boZkiJHCA" x="14" y="29"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_J7vfNIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LVWWcIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7vfNYuSEeiu6boZkiJHCA" x="-33" y="34"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_J7u4IYuSEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_J7u4IouSEeiu6boZkiJHCA" points="[1111, 481, -643984, -643984]$[1111, 323, -643984, -643984]$[1480, 323, -643984, -643984]$[1480, 1, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LChhEIuSEeiu6boZkiJHCA" id="(0.7771317829457365,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LCiIIIuSEeiu6boZkiJHCA" id="(0.36605657237936773,1.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_NFTRIIuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_ryFlIOr0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_NFTRI4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OHDpEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4MIuSEeiu6boZkiJHCA" x="-4" y="11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4MYuSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OJi8YIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4MouSEeiu6boZkiJHCA" x="-61" y="-23"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4M4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OMbRQIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4NIuSEeiu6boZkiJHCA" x="34" y="-17"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4NYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OO6kkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4NouSEeiu6boZkiJHCA" x="-31" y="18"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4N4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ORbtEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4OIuSEeiu6boZkiJHCA" x="14" y="16"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4OYuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OVqs0IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4OouSEeiu6boZkiJHCA" x="-16" y="15"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_NFTRIYuSEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_NFTRIouSEeiu6boZkiJHCA" points="[322, 375, -643984, -643984]$[322, 461, -643984, -643984]$[619, 461, -643984, -643984]$[619, 601, -643984, -643984]$[706, 601, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OEQzwIuSEeiu6boZkiJHCA" id="(0.7421052631578947,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OEQzwYuSEeiu6boZkiJHCA" id="(0.0,0.4979253112033195)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_S68O0IuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_rR8FcOr0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_S6814IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xrdfUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S6814YuSEeiu6boZkiJHCA" x="8" y="-2"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S6814ouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xvY9EKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S68144uSEeiu6boZkiJHCA" x="-11"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S6815IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xzTzwKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S6815YuSEeiu6boZkiJHCA" x="5" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S6815ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x3gXQKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S68154uSEeiu6boZkiJHCA" x="-5" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S6816IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x7uI4KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S6816YuSEeiu6boZkiJHCA" x="25" y="24"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_S6816ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yANnUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_S68164uSEeiu6boZkiJHCA" x="-21" y="26"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_S68O0YuSEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_S68O0ouSEeiu6boZkiJHCA" points="[170, 168, -643984, -643984]$[160, 255, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaiZUIuSEeiu6boZkiJHCA" id="(0.21052631578947367,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UvwbYIuSEeiu6boZkiJHCA" id="(0.19193857965451055,0.0)"/>
+    </edges>
+    <edges xsi:type="notation:Connector" xmi:id="_Wx-KwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v2L_wKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x0YuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v6OLMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x04uSEeiu6boZkiJHCA" x="48" y="-84"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v-UoEKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x1YuSEeiu6boZkiJHCA" x="24" y="-20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wCTwMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x14uSEeiu6boZkiJHCA" x="-24" y="20"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wGWisKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x2YuSEeiu6boZkiJHCA" x="20" y="-24"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wKSngKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x24uSEeiu6boZkiJHCA" x="-23" y="-26"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_Wx-KwYuSEeiu6boZkiJHCA"/>
+      <element href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Wx-KwouSEeiu6boZkiJHCA" points="[756, 481, -643984, -643984]$[756, 241, -643984, -643984]$[760, 241, -643984, -643984]$[760, 1, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_gnApcHJqEeq3NYg-TXSAxQ" id="(0.10465116279069768,0.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YzgksIuSEeiu6boZkiJHCA" id="(0.2603036876355748,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qz57QHJqEeq3NYg-TXSAxQ" type="Association_Edge" source="_QjgYUOsSEealN7CdLT_GPw" target="_LmxJ0HJqEeq3NYg-TXSAxQ" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qz57Q3JqEeq3NYg-TXSAxQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S368IILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RHJqEeq3NYg-TXSAxQ" x="15" y="-82"/>
+    <edges xsi:type="notation:Connector" xmi:id="_qz57QHJqEeq3NYg-TXSAxQ" type="Association_Edge" source="_QjgYUOsSEealN7CdLT_GPw" target="_LmxJ0HJqEeq3NYg-TXSAxQ" routing="Rectilinear">
+      <children xsi:type="notation:DecorationNode" xmi:id="_qz57Q3JqEeq3NYg-TXSAxQ" type="Association_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_S368IILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57RHJqEeq3NYg-TXSAxQ" x="15" y="-82"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qz57RXJqEeq3NYg-TXSAxQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S-s5kILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RnJqEeq3NYg-TXSAxQ" x="-9" y="-108"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_qz57RXJqEeq3NYg-TXSAxQ" type="Association_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_S-s5kILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57RnJqEeq3NYg-TXSAxQ" x="-9" y="-108"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qz57R3JqEeq3NYg-TXSAxQ" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TFMjIILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57SHJqEeq3NYg-TXSAxQ" x="18" y="-20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_qz57R3JqEeq3NYg-TXSAxQ" type="Association_TargetRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TFMjIILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57SHJqEeq3NYg-TXSAxQ" x="18" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qz57SXJqEeq3NYg-TXSAxQ" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TKM-8ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57SnJqEeq3NYg-TXSAxQ" x="-18" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_qz57SXJqEeq3NYg-TXSAxQ" type="Association_SourceRoleLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TKM-8ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57SnJqEeq3NYg-TXSAxQ" x="-18" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qz57S3JqEeq3NYg-TXSAxQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TOx88ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57THJqEeq3NYg-TXSAxQ" x="18" y="20"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_qz57S3JqEeq3NYg-TXSAxQ" type="Association_SourceMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TOx88ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57THJqEeq3NYg-TXSAxQ" x="18" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qz57TXJqEeq3NYg-TXSAxQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TT5tgILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57TnJqEeq3NYg-TXSAxQ" x="-18" y="24"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_qz57TXJqEeq3NYg-TXSAxQ" type="Association_TargetMultiplicityLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TT5tgILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57TnJqEeq3NYg-TXSAxQ" x="-18" y="24"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_qz57QXJqEeq3NYg-TXSAxQ"/>
-      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qz57QnJqEeq3NYg-TXSAxQ" points="[980, -39, -643984, -643984]$[980, 140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkHJqEeq3NYg-TXSAxQ" id="(0.737527114967462,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkXJqEeq3NYg-TXSAxQ" id="(0.4199475065616798,0.0)"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_qz57QXJqEeq3NYg-TXSAxQ"/>
+      <element href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qz57QnJqEeq3NYg-TXSAxQ" points="[980, -39, -643984, -643984]$[980, 140, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q6NXkHJqEeq3NYg-TXSAxQ" id="(0.737527114967462,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q6NXkXJqEeq3NYg-TXSAxQ" id="(0.4199475065616798,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w5aCkaavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_rR8FcOr0EeaeHOJw3lCT8A" target="_w5ZbgKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w5aCkqavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w5aClqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YMb_tKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_rR8FcOr0EeaeHOJw3lCT8A" target="_YMb_sKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YMb_tasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YMb_uasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w5aCk6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w5aClKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w5aClaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YMb_tqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YMb_t6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YMb_uKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w6C7waavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_w6CUs6avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w6C7wqavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6C7xqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YOTn9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_YOTn8KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YOTn9asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YOTn-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w6C7w6avEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6C7xKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6C7xaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YOTn9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YOTn96snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YOTn-KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w6scBKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_w6scAKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w6scBaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w6scCaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YPf6xKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_YPf6wKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YPf6xasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YPgh0qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w6scBqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6scB6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w6scCKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YPf6xqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YPgh0KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YPgh0asnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w7Ig5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_NFTRIIuSEeiu6boZkiJHCA" target="_w7Ig4KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w7Ig5aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7Ig6aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YQR94asnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_NFTRIIuSEeiu6boZkiJHCA" target="_YQRW0KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YQR94qsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQR95qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7Ig5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7Ig56avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7Ig6KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YQR946snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQR95KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQR95asnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w7POlKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_S68O0IuSEeiu6boZkiJHCA" target="_w7POkKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w7POlaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7POmaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YQYrlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_S68O0IuSEeiu6boZkiJHCA" target="_YQYrkKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YQYrlasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQZSo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7POlqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7POl6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7POmKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YQZSoKsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQZSoasnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQZSoqsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w7bb1KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QjgYUOsSEealN7CdLT_GPw" target="_w7bb0KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w7bb1aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7cC4KavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YQwfAKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_QjgYUOsSEealN7CdLT_GPw" target="_YQv38KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YQwfAasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQwfBasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7bb1qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7bb16avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7bb2KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YQwfAqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQwfA6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQwfBKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w7vk5KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qz57QHJqEeq3NYg-TXSAxQ" target="_w7vk4KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w7vk5aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w7wL8qavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YRYKFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_qz57QHJqEeq3NYg-TXSAxQ" target="_YRYKEKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YRYKFasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRYKGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w7vk5qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7wL8KavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7wL8aavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YRYKFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRYKF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRYKGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w8ADlKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_W4xb0OsTEealN7CdLT_GPw" target="_w8ADkKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w8ADlaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8AqoKavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YRzA1KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_W4xb0OsTEealN7CdLT_GPw" target="_YRzA0KsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YRzA1asnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRzA2asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8ADlqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8ADl6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8ADmKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YRzA1qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRzA16snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRzA2KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w8cIdKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xaYCMIuREeiu6boZkiJHCA" target="_w8cIcKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w8cIdaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8cIeaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YS07kasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xaYCMIuREeiu6boZkiJHCA" target="_YS0UgKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YS07kqsnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS07lqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8cIdqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8cId6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8cIeKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YS07k6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS07lKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS07lasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w8kERKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7buLUIuREeiu6boZkiJHCA" target="_w8kEQKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w8kERaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8kESaavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YS8QVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7buLUIuREeiu6boZkiJHCA" target="_YS8QUKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YS8QVasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS8QWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8kERqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8kER6avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8kESKavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YS8QVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS8QV6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS8QWKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w8qx9KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__1Uo0IuREeiu6boZkiJHCA" target="_w8qx8KavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w8qx9aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w8rZAqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YTC-BKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__1Uo0IuREeiu6boZkiJHCA" target="_YTC-AKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YTC-BasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTC-CasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w8qx9qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8rZAKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w8rZAaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YTC-BqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTC-B6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTC-CKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w81KBKavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__j6psOscEealN7CdLT_GPw" target="_w81KAKavEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w81KBaavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w81xEqavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YTcmpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__j6psOscEealN7CdLT_GPw" target="_YTcmoKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YTcmpasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTdNsqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w81KBqavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w81xEKavEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w81xEaavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YTcmpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTdNsKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTdNsasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_w9kw4KavEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_LmxJ0HJqEeq3NYg-TXSAxQ" target="_w9kJ06avEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_w9kw4aavEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w9kw5aavEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
+    <edges xsi:type="notation:Connector" xmi:id="_YU7NVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_LmxJ0HJqEeq3NYg-TXSAxQ" target="_YU7NUKsnEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_YU7NVasnEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YU7NWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w9kw4qavEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w9kw46avEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w9kw5KavEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YU7NVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YU7NV6snEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YU7NWKsnEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_W_wkgPItEea79czpMf3AVQ" type="PapyrusUMLClassDiagram" name="DataTypes" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_X295UPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_X295UvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_X295U_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_X295VPItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_X295VfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_aeYngPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_1OME8L1xEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aeYngfItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_aeYngvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_4mNJoL1xEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aeYng_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_aeYnhPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_8UPhoL1xEeWdore3Cxez9g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aeYnhfItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_kpzWsGZtEeeB_84HvuxJBw" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_i55fUGZtEeeB_84HvuxJBw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kpzWsWZtEeeB_84HvuxJBw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_X295VvItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_X295V_ItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_X295WPItEea79czpMf3AVQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X295WfItEea79czpMf3AVQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_0-X6sLvZEeWYrqoqXLgguw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X295UfItEea79czpMf3AVQ" x="63" y="27"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Y--DMPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y_EJ0PItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y_EJ0fItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_EJ0vItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Y_EJ0_ItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_bNDrYPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_yahuMurzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_bNDrYfItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_bNDrYvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_yahuNOrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_bNDrY_ItEea79czpMf3AVQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Y_EJ1PItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Y_EJ1fItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_EJ1vItEea79czpMf3AVQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_EJ1_ItEea79czpMf3AVQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_yahuMOrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y--DMfItEea79czpMf3AVQ" x="52" y="307"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZQHdkPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZQHdkvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZQHdk_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZQHdlPItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ZQHdlfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_cEr28PItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_ya6ItOrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEr28fItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_cEseAPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_NS_zMOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEseAfItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_cEseAvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_OesxUOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEseA_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_cEseBPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_P6rAEOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEseBfItEea79czpMf3AVQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ZQHdlvItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ZQHdl_ItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZQHdmPItEea79czpMf3AVQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZQHdmfItEea79czpMf3AVQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZQHdkfItEea79czpMf3AVQ" x="53" y="171"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZgKEsPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZgKEsvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZgKEs_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgKEtPItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ZgKEtfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_c3kscPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_6SvY4Or5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3kscfItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_c3kscvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_77pQYOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksc_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_c3ksdPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_9D5R4Or5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksdfItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_c3ksdvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_-84MwOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksd_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_c3ksePItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_HeXssOr6EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksefItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_c3ksevItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_I_ObcOr6EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3kse_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_c3ksfPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_KaoCcOr6EeaeHOJw3lCT8A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksffItEea79czpMf3AVQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ZgKEtvItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ZgKEt_ItEea79czpMf3AVQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgKEuPItEea79czpMf3AVQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgKEufItEea79czpMf3AVQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6Iu-rzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgKEsfItEea79czpMf3AVQ" x="181" y="171"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_CY6TQIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_CY99oIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_CY99oYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CY99oohBEeeOl5P_FBJSmA" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_CY-ksIhBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_MQifsIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_QqOi4CmxEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQifsYhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_MQjGwIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_VVyKYCsiEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjGwYhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_MQjGwohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_SeYBECmxEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjGw4hBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_MQjt0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_UrO6MCmxEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjt0YhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_MQjt0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_2HxMYGrhEeezaeKmbo_0Qw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjt04hBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_MQjt1IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_3OZdQGrhEeezaeKmbo_0Qw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjt1YhBEeeOl5P_FBJSmA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_CY-ksYhBEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_CY-ksohBEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CY-ks4hBEeeOl5P_FBJSmA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CY-ktIhBEeeOl5P_FBJSmA"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_KtcbYCmxEeeA7tvtQmACtQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CY6TQYhBEeeOl5P_FBJSmA" x="348" y="211"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_IDDyoIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDEZsIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_IDEZsYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDEZsohBEeeOl5P_FBJSmA" y="5"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IDEZs4hBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_I-b1wIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_t0InYCmoEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_I-b1wYhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_I-cc0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_N9G5gCmqEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_I-cc0YhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_I-cc0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_Pr8Z4CmqEeeA7tvtQmACtQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_I-cc04hBEeeOl5P_FBJSmA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IDEZtIhBEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IDEZtYhBEeeOl5P_FBJSmA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IDEZtohBEeeOl5P_FBJSmA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IDEZt4hBEeeOl5P_FBJSmA"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#__jPYUCmmEeeA7tvtQmACtQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IDDyoYhBEeeOl5P_FBJSmA" x="340" y="59"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_dzHqsHJYEeq3NYg-TXSAxQ" type="DataType_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_dzHqsnJYEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dzHqs3JYEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dzHqtHJYEeq3NYg-TXSAxQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dzIRwHJYEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_ta7GAHJYEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_talHwHJYEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ta7GAXJYEeq3NYg-TXSAxQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_PT_FQIWsEeqR8PjK46Cjgg" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_PTR6oIWsEeqR8PjK46Cjgg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_PT_FQYWsEeqR8PjK46Cjgg"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dzIRwXJYEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_dzIRwnJYEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dzIRw3JYEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dzIRxHJYEeq3NYg-TXSAxQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dzIRxXJYEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dzIRxnJYEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_dzIRx3JYEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dzIRyHJYEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dzIRyXJYEeq3NYg-TXSAxQ"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiConnectivity.uml#_dzGckHJYEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dzHqsXJYEeq3NYg-TXSAxQ" x="580" y="240" width="261" height="101"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_NYE_IHJZEeq3NYg-TXSAxQ" type="DataType_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_NYE_InJZEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NYE_I3JZEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NYE_JHJZEeq3NYg-TXSAxQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_NYE_JXJZEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_SXam8HJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_SWh2IHJZEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_SXam8XJZEeq3NYg-TXSAxQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_sADOAHJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
-          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_r_hCgHJZEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_sADOAXJZEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_NYE_JnJZEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_NYE_J3JZEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_NYE_KHJZEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYE_KXJZEeq3NYg-TXSAxQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_NYFmMHJZEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_NYFmMXJZEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_NYFmMnJZEeq3NYg-TXSAxQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_NYFmM3JZEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYFmNHJZEeq3NYg-TXSAxQ"/>
-      </children>
-      <element xmi:type="uml:DataType" href="TapiConnectivity.uml#_NYDxAHJZEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYE_IXJZEeq3NYg-TXSAxQ" x="580" y="60" width="381" height="81"/>
-    </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_W_wkgfItEea79czpMf3AVQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_W_wkgvItEea79czpMf3AVQ"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_IK7_AIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <children xsi:type="notation:Shape" xmi:id="_X295UPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_X295UvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_X295U_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_X295VPItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_X295VfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_aeYngPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_1OME8L1xEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_aeYngfItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_aeYngvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_4mNJoL1xEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_aeYng_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_aeYnhPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_8UPhoL1xEeWdore3Cxez9g"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_aeYnhfItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_kpzWsGZtEeeB_84HvuxJBw" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_i55fUGZtEeeB_84HvuxJBw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_kpzWsWZtEeeB_84HvuxJBw"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_X295VvItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_X295V_ItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_X295WPItEea79czpMf3AVQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X295WfItEea79czpMf3AVQ"/>
+      </children>
+      <element href="TapiConnectivity.uml#_0-X6sLvZEeWYrqoqXLgguw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X295UfItEea79czpMf3AVQ" x="63" y="27"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_Y--DMPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_Y_EJ0PItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_Y_EJ0fItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y_EJ0vItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_Y_EJ0_ItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_bNDrYPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_yahuMurzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_bNDrYfItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_bNDrYvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_yahuNOrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_bNDrY_ItEea79czpMf3AVQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_Y_EJ1PItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_Y_EJ1fItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_Y_EJ1vItEea79czpMf3AVQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y_EJ1_ItEea79czpMf3AVQ"/>
+      </children>
+      <element href="TapiConnectivity.uml#_yahuMOrzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y--DMfItEea79czpMf3AVQ" x="52" y="307"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ZQHdkPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZQHdkvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZQHdk_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZQHdlPItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ZQHdlfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_cEr28PItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_ya6ItOrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEr28fItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_cEseAPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_NS_zMOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEseAfItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_cEseAvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_OesxUOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEseA_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_cEseBPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_P6rAEOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEseBfItEea79czpMf3AVQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ZQHdlvItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ZQHdl_ItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ZQHdmPItEea79czpMf3AVQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZQHdmfItEea79czpMf3AVQ"/>
+      </children>
+      <element href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZQHdkfItEea79czpMf3AVQ" x="53" y="171"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_ZgKEsPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZgKEsvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_ZgKEs_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZgKEtPItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_ZgKEtfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_c3kscPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_6SvY4Or5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3kscfItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c3kscvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_77pQYOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksc_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c3ksdPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_9D5R4Or5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksdfItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c3ksdvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_-84MwOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksd_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c3ksePItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_HeXssOr6EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksefItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c3ksevItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_I_ObcOr6EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3kse_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_c3ksfPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_KaoCcOr6EeaeHOJw3lCT8A"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksffItEea79czpMf3AVQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ZgKEtvItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_ZgKEt_ItEea79czpMf3AVQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_ZgKEuPItEea79czpMf3AVQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZgKEufItEea79czpMf3AVQ"/>
+      </children>
+      <element href="TapiConnectivity.uml#_ya6Iu-rzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZgKEsfItEea79czpMf3AVQ" x="181" y="171"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_CY6TQIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_CY99oIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_CY99oYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_CY99oohBEeeOl5P_FBJSmA" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_CY-ksIhBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_MQifsIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_QqOi4CmxEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQifsYhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_MQjGwIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_VVyKYCsiEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjGwYhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_MQjGwohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_SeYBECmxEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjGw4hBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_MQjt0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_UrO6MCmxEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjt0YhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_MQjt0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_2HxMYGrhEeezaeKmbo_0Qw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjt04hBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_MQjt1IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_3OZdQGrhEeezaeKmbo_0Qw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjt1YhBEeeOl5P_FBJSmA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_CY-ksYhBEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_CY-ksohBEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_CY-ks4hBEeeOl5P_FBJSmA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CY-ktIhBEeeOl5P_FBJSmA"/>
+      </children>
+      <element href="TapiConnectivity.uml#_KtcbYCmxEeeA7tvtQmACtQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CY6TQYhBEeeOl5P_FBJSmA" x="348" y="211"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_IDDyoIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDEZsIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_IDEZsYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDEZsohBEeeOl5P_FBJSmA" y="5"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_IDEZs4hBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_I-b1wIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_t0InYCmoEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_I-b1wYhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_I-cc0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_N9G5gCmqEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_I-cc0YhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_I-cc0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element href="TapiConnectivity.uml#_Pr8Z4CmqEeeA7tvtQmACtQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_I-cc04hBEeeOl5P_FBJSmA"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_IDEZtIhBEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_IDEZtYhBEeeOl5P_FBJSmA"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_IDEZtohBEeeOl5P_FBJSmA"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IDEZt4hBEeeOl5P_FBJSmA"/>
+      </children>
+      <element href="TapiConnectivity.uml#__jPYUCmmEeeA7tvtQmACtQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IDDyoYhBEeeOl5P_FBJSmA" x="340" y="59"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_dzHqsHJYEeq3NYg-TXSAxQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_dzHqsnJYEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_dzHqs3JYEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_dzHqtHJYEeq3NYg-TXSAxQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_dzIRwHJYEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_ta7GAHJYEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiConnectivity.uml#_talHwHJYEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_ta7GAXJYEeq3NYg-TXSAxQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_PT_FQIWsEeqR8PjK46Cjgg" type="Property_DataTypeAttributeLabel">
+          <element href="TapiConnectivity.uml#_PTR6oIWsEeqR8PjK46Cjgg"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_PT_FQYWsEeqR8PjK46Cjgg"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_dzIRwXJYEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_dzIRwnJYEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_dzIRw3JYEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dzIRxHJYEeq3NYg-TXSAxQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_dzIRxXJYEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_dzIRxnJYEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_dzIRx3JYEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_dzIRyHJYEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dzIRyXJYEeq3NYg-TXSAxQ"/>
+      </children>
+      <element href="TapiConnectivity.uml#_dzGckHJYEeq3NYg-TXSAxQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dzHqsXJYEeq3NYg-TXSAxQ" x="580" y="240" width="261" height="101"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_NYE_IHJZEeq3NYg-TXSAxQ" type="DataType_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_NYE_InJZEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_NYE_I3JZEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_NYE_JHJZEeq3NYg-TXSAxQ" y="15"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_NYE_JXJZEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_SXam8HJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiConnectivity.uml#_SWh2IHJZEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_SXam8XJZEeq3NYg-TXSAxQ"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_sADOAHJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
+          <element href="TapiConnectivity.uml#_r_hCgHJZEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_sADOAXJZEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_NYE_JnJZEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_NYE_J3JZEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_NYE_KHJZEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NYE_KXJZEeq3NYg-TXSAxQ"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_NYFmMHJZEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_NYFmMXJZEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_NYFmMnJZEeq3NYg-TXSAxQ"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_NYFmM3JZEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NYFmNHJZEeq3NYg-TXSAxQ"/>
+      </children>
+      <element href="TapiConnectivity.uml#_NYDxAHJZEeq3NYg-TXSAxQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NYE_IXJZEeq3NYg-TXSAxQ" x="580" y="60" width="381" height="81"/>
+    </children>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_W_wkgfItEea79czpMf3AVQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_W_wkgvItEea79czpMf3AVQ"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_IK7_AIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_HWF0wHh-EeqVN_GB3rPx7g" type="Usage_Edge" source="_NYE_IHJZEeq3NYg-TXSAxQ" target="_dzHqsHJYEeq3NYg-TXSAxQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_HWGb0Hh-EeqVN_GB3rPx7g" type="Usage_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H1BMcHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HWGb0Xh-EeqVN_GB3rPx7g" x="1" y="38"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_HWGb0nh-EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H1hiwHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HWGb03h-EeqVN_GB3rPx7g" x="1" y="57"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_HWF0wXh-EeqVN_GB3rPx7g"/>
-      <element xmi:type="uml:Usage" href="TapiConnectivity.uml#_HWEmoHh-EeqVN_GB3rPx7g"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HWF0wnh-EeqVN_GB3rPx7g" points="[961, 160, -643984, -643984]$[841, 280, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HXJksHh-EeqVN_GB3rPx7g" id="(0.4199475065616798,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HXJksXh-EeqVN_GB3rPx7g" id="(0.6130268199233716,0.0)"/>
+    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xsi:type="notation:Connector" xmi:id="_HWF0wHh-EeqVN_GB3rPx7g" type="Usage_Edge" source="_NYE_IHJZEeq3NYg-TXSAxQ" target="_dzHqsHJYEeq3NYg-TXSAxQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_HWGb0Hh-EeqVN_GB3rPx7g" type="Usage_NameLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_H1BMcHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HWGb0Xh-EeqVN_GB3rPx7g" x="1" y="38"/>
+      </children>
+      <children xsi:type="notation:DecorationNode" xmi:id="_HWGb0nh-EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
+        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_H1hiwHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_HWGb03h-EeqVN_GB3rPx7g" x="1" y="57"/>
+      </children>
+      <styles xsi:type="notation:FontStyle" xmi:id="_HWF0wXh-EeqVN_GB3rPx7g"/>
+      <element href="TapiConnectivity.uml#_HWEmoHh-EeqVN_GB3rPx7g"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HWF0wnh-EeqVN_GB3rPx7g" points="[961, 160, -643984, -643984]$[841, 280, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HXJksHh-EeqVN_GB3rPx7g" id="(0.4199475065616798,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HXJksXh-EeqVN_GB3rPx7g" id="(0.6130268199233716,0.0)"/>
     </edges>
   </notation:Diagram>
-  <css:ModelStyleSheets xmi:id="_oSV1sIDJEeqLl4tIPv2RCg"/>
+  <css:ModelStyleSheets xmi:id="_oSV1sIDJEeqLl4tIPv2RCg">
+    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
+    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  </css:ModelStyleSheets>
 </xmi:XMI>
diff --git a/UML/TapiConnectivity.uml b/UML/TapiConnectivity.uml
index 73442880..754d0883 100644
--- a/UML/TapiConnectivity.uml
+++ b/UML/TapiConnectivity.uml
@@ -754,9 +754,8 @@ The ForwadingConstruct can be considered as a component and the EndPoint as a Po
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_kkzTEEUbEeWKAbXi7_SowQ" name="Route" isLeaf="true">
         <ownedComment xmi:type="uml:Comment" xmi:id="_kkzTEUUbEeWKAbXi7_SowQ" annotatedElement="_kkzTEEUbEeWKAbXi7_SowQ">
-          <body>The FC Route (FcRoute) object class models the individual routes of an FC. &#xD;
-The route of an FC object is represented by a list of FCs at a lower level. &#xD;
-Note that depending on the service supported by an FC, an the FC can have multiple routes.</body>
+          <body>The Route of a Connection is modeled as a collection of Connection End Points.&#xD;
+The logical order of the Connection End Points within the Route object can be inferred by the TAPI client by the knowledge of the Topology information.</body>
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_HOnysN8rEeWT9tG0gGLRFw">
           <general xmi:type="uml:Class" href="TapiCommon.uml#_UhrZoN8qEeWT9tG0gGLRFw"/>
diff --git a/UML/TapiEquipment.notation b/UML/TapiEquipment.notation
index 8b201d21..ab577d13 100644
--- a/UML/TapiEquipment.notation
+++ b/UML/TapiEquipment.notation
@@ -1,1558 +1,1558 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_hb9FIC8LEeexxefg2F1i1Q" type="PapyrusUMLClassDiagram" name="EquipmentPatternSkeleton" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_hb9s5C8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9s5S8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9s5i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_hb9s5C8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9s5S8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9s5i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9s5y8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9s5y8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hb9s6C8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9s6S8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9s6i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_hb9s6C8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9s6S8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9s6i8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9s6y8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9s6y8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hb9tUS8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9tUi8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9tUy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_hb9tUS8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9tUi8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9tUy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9tVC8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9tVC8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hb9tVS8LEeexxefg2F1i1Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hb9tVi8LEeexxefg2F1i1Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9tVy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_hb9tVS8LEeexxefg2F1i1Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hb9tVi8LEeexxefg2F1i1Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9tVy8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hb9tWC8LEeexxefg2F1i1Q" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hb9tWC8LEeexxefg2F1i1Q" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_kfYgcDmuEem1ZNpCEF2XWQ" type="Comment_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_kfYgcjmuEem1ZNpCEF2XWQ" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kfYgcTmuEem1ZNpCEF2XWQ" x="-20" y="-260" width="281" height="21"/>
+    <children xmi:type="notation:Shape" xmi:id="_kfYgcDmuEem1ZNpCEF2XWQ" type="Comment_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kfYgcjmuEem1ZNpCEF2XWQ" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfYgcTmuEem1ZNpCEF2XWQ" x="-20" y="-260" width="281" height="21"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="__vjDakv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDa0v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDbEv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDbUv0EemT5f_Ewhfs6A" y="15"/>
+    <children xmi:type="notation:Shape" xmi:id="__vjDakv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDa0v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDbEv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDbUv0EemT5f_Ewhfs6A" y="15"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vjDbkv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="__vjDb0v0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:id="__vjDcEv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vjDbkv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vjDb0v0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vjDcEv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="__vjDcUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDo0v0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vjDpEv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vjDpUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjDpkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjDp0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vjDqEv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vjDqUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vjDqkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjDq0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjDrEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vjDrUv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vjDrkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vjDr0v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjDsEv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjDsUv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjD5kv0EemT5f_Ewhfs6A" x="337" y="148" width="160"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__vjqd0v0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqeEv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqeUv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqekv0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vjqe0v0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="__vjqfEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqrkv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vjqr0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vjq4Uv0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vjq4kv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vjq40v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjq5Ev0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjq5Uv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vjq5kv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vjq50v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vjq6Ev0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjq6Uv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjq6kv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vjq60v0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vjq7Ev0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vjq7Uv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vjq7kv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vjq70v0EemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vkRikv0EemT5f_Ewhfs6A" x="533" y="-258" height="114"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__vk4gEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vk4gUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vk4gkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vk4g0v0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vk4hEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="__vk4hUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:id="__vk4hkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="__vjDcUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDo0v0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vjDpEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vjDpUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjDpkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjDp0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vjDqEv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vjDqUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vjDqkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjDq0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjDrEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vjDrUv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vjDrkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vjDr0v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjDsEv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjDsUv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjD5kv0EemT5f_Ewhfs6A" x="337" y="148" width="160"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__vjqd0v0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqeEv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqeUv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqekv0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vjqe0v0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="__vjqfEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqrkv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vjqr0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vjq4Uv0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vjq4kv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vjq40v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjq5Ev0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjq5Uv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vjq5kv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vjq50v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vjq6Ev0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjq6Uv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjq6kv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vjq60v0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vjq7Ev0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vjq7Uv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vjq7kv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vjq70v0EemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vkRikv0EemT5f_Ewhfs6A" x="533" y="-258" height="114"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__vk4gEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vk4gUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vk4gkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vk4g0v0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vk4hEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vk4hUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vk4hkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="__vk4h0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vk4uUv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vk4ukv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vk47Ev0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vk47Uv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vk47kv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vk470v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk48Ev0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vk48Uv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vk48kv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vk480v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vk49Ev0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk49Uv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vk49kv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vk490v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vk4-Ev0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vk4-Uv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk4-kv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vk5L0v0EemT5f_Ewhfs6A" x="737" y="-152" width="150"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__vmGoEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vmGoUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vmGokv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vmGo0v0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vmGpEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="__vmGpUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmG10v0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vmG2Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmHCkv0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vmHC0v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vmHDEv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmHDUv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHDkv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vmHD0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vmHEEv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vmHEUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmHEkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHE0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vmHFEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vmHFUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vmHFkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmHF0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHGEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmHTUv0EemT5f_Ewhfs6A" x="337" y="-152" width="160"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__vmtsEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vmtsUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vmtskv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vmts0v0EemT5f_Ewhfs6A" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vmttEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="__vmttUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:id="__vmttkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="__vk4h0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vk4uUv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vk4ukv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vk47Ev0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vk47Uv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vk47kv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vk470v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk48Ev0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vk48Uv0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vk48kv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vk480v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vk49Ev0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk49Uv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vk49kv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vk490v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vk4-Ev0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vk4-Uv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk4-kv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vk5L0v0EemT5f_Ewhfs6A" x="737" y="-152" width="150"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__vmGoEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vmGoUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vmGokv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vmGo0v0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vmGpEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="__vmGpUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmG10v0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vmG2Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmHCkv0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vmHC0v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vmHDEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmHDUv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHDkv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vmHD0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vmHEEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vmHEUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmHEkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHE0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vmHFEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vmHFUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vmHFkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmHF0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHGEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmHTUv0EemT5f_Ewhfs6A" x="337" y="-152" width="160"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__vmtsEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vmtsUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vmtskv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vmts0v0EemT5f_Ewhfs6A" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vmttEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vmttUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vmttkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="__vmtt0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmt6Uv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vmt6kv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmuHEv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vmuHUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vmuT0v0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vmuUEv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vmuUUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmuUkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmuU0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vmuVEv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vmuVUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vmuVkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmuV0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmuWEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vmuWUv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vmuWkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vmuW0v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vmuXEv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmuXUv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vmukkv0EemT5f_Ewhfs6A" x="-3" y="148" width="160"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__vn76kv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn760v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn77Ev0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn77Uv0EemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vn77kv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="__vn770v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vn8IUv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vn8Ikv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vn8VEv0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vn8VUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vojD0v0EemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__vojEEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vojQkv0EemT5f_Ewhfs6A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vojQ0v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vojREv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vojRUv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojRkv0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vojR0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vojSEv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vojSUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vojSkv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojS0v0EemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vojTEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vojTUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vojTkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vojT0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojUEv0EemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vojhUv0EemT5f_Ewhfs6A" x="737" y="86" width="160"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__vpxNEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxNUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxNkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxN0v0EemT5f_Ewhfs6A" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vpxOEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="__vpxOUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:id="__vpxOkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="__vmtt0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmt6Uv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vmt6kv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmuHEv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vmuHUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vmuT0v0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vmuUEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vmuUUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmuUkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmuU0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vmuVEv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vmuVUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vmuVkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmuV0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmuWEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vmuWUv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vmuWkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vmuW0v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vmuXEv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmuXUv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vmukkv0EemT5f_Ewhfs6A" x="-3" y="148" width="160"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__vn76kv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn760v0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn77Ev0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn77Uv0EemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vn77kv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="__vn770v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vn8IUv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vn8Ikv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vn8VEv0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vn8VUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vojD0v0EemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__vojEEv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vojQkv0EemT5f_Ewhfs6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vojQ0v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vojREv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vojRUv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojRkv0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vojR0v0EemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vojSEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vojSUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vojSkv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojS0v0EemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vojTEv0EemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vojTUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vojTkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vojT0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojUEv0EemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vojhUv0EemT5f_Ewhfs6A" x="737" y="86" width="160"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__vpxNEv0EemT5f_Ewhfs6A" type="Class_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxNUv0EemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxNkv0EemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxN0v0EemT5f_Ewhfs6A" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vpxOEv0EemT5f_Ewhfs6A" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vpxOUv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vpxOkv0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="__vpxO0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxbUv0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpxO0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxbUv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="__vpxbkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxoEv0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpxbkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxoEv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="__vpxoUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpx00v0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpxoUv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpx00v0EemT5f_Ewhfs6A"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="__vpx1Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpyBkv0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpx1Ev0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpyBkv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="__vpyB0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpyMkv0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpyB0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpyMkv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="__vpyM0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpyZUv0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpyM0v0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpyZUv0EemT5f_Ewhfs6A"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="__vpyZkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__vpymEv0EemT5f_Ewhfs6A"/>
+        <children xmi:type="notation:Shape" xmi:id="__vpyZkv0EemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__vpymEv0EemT5f_Ewhfs6A"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vpymUv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vpymkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vpym0v0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpynEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vpymUv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vpymkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vpym0v0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpynEv0EemT5f_Ewhfs6A"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vpynUv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vpynkv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vpyn0v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vpyoEv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpyoUv0EemT5f_Ewhfs6A"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vpynUv0EemT5f_Ewhfs6A" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vpynkv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vpyn0v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vpyoEv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpyoUv0EemT5f_Ewhfs6A"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__vpyokv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__vpyo0v0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__vpypEv0EemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__vpypUv0EemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpypkv0EemT5f_Ewhfs6A"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__vpyokv0EemT5f_Ewhfs6A" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__vpyo0v0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__vpypEv0EemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__vpypUv0EemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpypkv0EemT5f_Ewhfs6A"/>
       </children>
-      <element href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__vpy20v0EemT5f_Ewhfs6A" x="-3" y="-72" width="160"/>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__vpy20v0EemT5f_Ewhfs6A" x="-3" y="-72" width="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_FoNqYEv2EemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_FoORcEv2EemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_FoORcUv2EemT5f_Ewhfs6A" x="-4" y="-205" width="281" height="8"/>
+    <children xmi:type="notation:Shape" xmi:id="_FoNqYEv2EemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FoORcEv2EemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FoORcUv2EemT5f_Ewhfs6A" x="-4" y="-205" width="281" height="8"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_iEA1sFolEemu443YKSGnxQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_iEA1slolEemu443YKSGnxQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iEA1s1olEemu443YKSGnxQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iEA1tFolEemu443YKSGnxQ" y="15"/>
+    <children xmi:type="notation:Shape" xmi:id="_iEA1sFolEemu443YKSGnxQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iEA1slolEemu443YKSGnxQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iEA1s1olEemu443YKSGnxQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iEA1tFolEemu443YKSGnxQ" y="15"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_iEA1tVolEemu443YKSGnxQ" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_iEA1tlolEemu443YKSGnxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_iEA1t1olEemu443YKSGnxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_iEA1uFolEemu443YKSGnxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1uVolEemu443YKSGnxQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iEA1tVolEemu443YKSGnxQ" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iEA1tlolEemu443YKSGnxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iEA1t1olEemu443YKSGnxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iEA1uFolEemu443YKSGnxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1uVolEemu443YKSGnxQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_iEA1ulolEemu443YKSGnxQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_iEA1u1olEemu443YKSGnxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_iEA1vFolEemu443YKSGnxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_iEA1vVolEemu443YKSGnxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1vlolEemu443YKSGnxQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iEA1ulolEemu443YKSGnxQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iEA1u1olEemu443YKSGnxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iEA1vFolEemu443YKSGnxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iEA1vVolEemu443YKSGnxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1vlolEemu443YKSGnxQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_iEA1v1olEemu443YKSGnxQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_iEA1wFolEemu443YKSGnxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_iEA1wVolEemu443YKSGnxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_iEA1wlolEemu443YKSGnxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1w1olEemu443YKSGnxQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iEA1v1olEemu443YKSGnxQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iEA1wFolEemu443YKSGnxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iEA1wVolEemu443YKSGnxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iEA1wlolEemu443YKSGnxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1w1olEemu443YKSGnxQ"/>
       </children>
-      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_iEA1sVolEemu443YKSGnxQ" x="857" y="-266" height="79"/>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iEA1sVolEemu443YKSGnxQ" x="857" y="-266" height="79"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XqjNgB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XqjNgR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XqjNgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_XqjNgB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XqjNgR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XqjNgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XqjNgh0zEeqCFrodiWelgQ" x="537" y="148"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XqjNgh0zEeqCFrodiWelgQ" x="537" y="148"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XrQYIB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XrQYIR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrQYIx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_XrQYIB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XrQYIR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrQYIx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XrQYIh0zEeqCFrodiWelgQ" x="733" y="-258"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XrQYIh0zEeqCFrodiWelgQ" x="733" y="-258"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xrqn0B0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xrqn0R0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xrqn0x0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xrqn0B0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xrqn0R0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xrqn0x0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xrqn0h0zEeqCFrodiWelgQ" x="733" y="-358"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xrqn0h0zEeqCFrodiWelgQ" x="733" y="-358"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XrzKsB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XrzKsR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrzKsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_XrzKsB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XrzKsR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrzKsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XrzKsh0zEeqCFrodiWelgQ" x="733" y="-358"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XrzKsh0zEeqCFrodiWelgQ" x="733" y="-358"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xr4qQB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xr4qQR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xr4qQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xr4qQB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xr4qQR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xr4qQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xr4qQh0zEeqCFrodiWelgQ" x="733" y="-358"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xr4qQh0zEeqCFrodiWelgQ" x="733" y="-358"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XsaOsB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XsaOsR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XsaOsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <children xmi:type="notation:Shape" xmi:id="_XsaOsB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XsaOsR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XsaOsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XsaOsh0zEeqCFrodiWelgQ" x="937" y="-152"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsaOsh0zEeqCFrodiWelgQ" x="937" y="-152"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XszQQB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XszQQR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XszQQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <children xmi:type="notation:Shape" xmi:id="_XszQQB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XszQQR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XszQQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XszQQh0zEeqCFrodiWelgQ" x="937" y="-252"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XszQQh0zEeqCFrodiWelgQ" x="937" y="-252"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xs7MEB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xs7MER0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xs7MEx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xs7MEB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xs7MER0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xs7MEx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xs7MEh0zEeqCFrodiWelgQ" x="937" y="-252"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xs7MEh0zEeqCFrodiWelgQ" x="937" y="-252"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XtmhgB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XtmhgR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xtmhgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_XtmhgB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XtmhgR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xtmhgx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xtmhgh0zEeqCFrodiWelgQ" x="537" y="-152"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xtmhgh0zEeqCFrodiWelgQ" x="537" y="-152"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xt74sB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xt74sR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xt74sx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xt74sB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xt74sR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xt74sx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xt74sh0zEeqCFrodiWelgQ" x="537" y="-252"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xt74sh0zEeqCFrodiWelgQ" x="537" y="-252"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XuFpsB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XuFpsR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuFpsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_XuFpsB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XuFpsR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuFpsx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XuFpsh0zEeqCFrodiWelgQ" x="537" y="-252"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XuFpsh0zEeqCFrodiWelgQ" x="537" y="-252"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XuocQB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XuocQR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuocQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_XuocQB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XuocQR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuocQx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XuocQh0zEeqCFrodiWelgQ" x="197" y="148"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XuocQh0zEeqCFrodiWelgQ" x="197" y="148"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xu7XMB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xu7XMR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xu7XMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xu7XMB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xu7XMR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xu7XMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xu7XMh0zEeqCFrodiWelgQ" x="197" y="48"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xu7XMh0zEeqCFrodiWelgQ" x="197" y="48"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XvibMB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XvibMR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XvibMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_XvibMB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XvibMR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XvibMx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XvibMh0zEeqCFrodiWelgQ" x="937" y="86"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XvibMh0zEeqCFrodiWelgQ" x="937" y="86"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xv4ZcB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xv4ZcR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv4Zcx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xv4ZcB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xv4ZcR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv4Zcx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xv4Zch0zEeqCFrodiWelgQ" x="937" y="-14"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xv4Zch0zEeqCFrodiWelgQ" x="937" y="-14"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xv95AB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xv95AR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv-gEB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xv95AB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xv95AR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv-gEB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xv95Ah0zEeqCFrodiWelgQ" x="937" y="-14"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xv95Ah0zEeqCFrodiWelgQ" x="937" y="-14"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XwgrkB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XwgrkR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xwgrkx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_XwgrkB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XwgrkR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xwgrkx0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xwgrkh0zEeqCFrodiWelgQ" x="197" y="-72"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xwgrkh0zEeqCFrodiWelgQ" x="197" y="-72"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xw00oB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xw00oR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xw00ox0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xw00oB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xw00oR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xw00ox0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xw00oh0zEeqCFrodiWelgQ" x="197" y="-172"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xw00oh0zEeqCFrodiWelgQ" x="197" y="-172"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XxZcYB0zEeqCFrodiWelgQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XxZcYR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxaDcB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XxZcYB0zEeqCFrodiWelgQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XxZcYR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XxaDcB0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XxZcYh0zEeqCFrodiWelgQ" x="1057" y="-266"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XxZcYh0zEeqCFrodiWelgQ" x="1057" y="-266"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_hb9t2i8LEeexxefg2F1i1Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_hb9t2y8LEeexxefg2F1i1Q"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_p-B3QB7PEemtpZa4_mUYIA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_hb9t2i8LEeexxefg2F1i1Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_hb9t2y8LEeexxefg2F1i1Q"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_p-B3QB7PEemtpZa4_mUYIA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
     </styles>
-    <element href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_hb9t7y8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s5C8LEeexxefg2F1i1Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hb9t8C8LEeexxefg2F1i1Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9t8S8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hb9t8i8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t8y8LEeexxefg2F1i1Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t9C8LEeexxefg2F1i1Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hb9t9S8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s6C8LEeexxefg2F1i1Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hb9t9i8LEeexxefg2F1i1Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9t9y8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hb9t-C8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t-S8LEeexxefg2F1i1Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9t-i8LEeexxefg2F1i1Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hb9uli8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9tUS8LEeexxefg2F1i1Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hb9uly8LEeexxefg2F1i1Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hb9umC8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hb9umS8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9umi8LEeexxefg2F1i1Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hb9umy8LEeexxefg2F1i1Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vicQEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vicQUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicQkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicQ0v0EemT5f_Ewhfs6A" x="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vicREv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicRUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicRkv0EemT5f_Ewhfs6A" x="3" y="2"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vicR0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicSEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicSUv0EemT5f_Ewhfs6A" x="15" y="-82"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vicSkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicS0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicTEv0EemT5f_Ewhfs6A" x="-17" y="-40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vicTUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicTkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicT0v0EemT5f_Ewhfs6A" x="15" y="-14"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vicUEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vicUUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vicUkv0EemT5f_Ewhfs6A" x="-20" y="-15"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vicU0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vicV0v0EemT5f_Ewhfs6A" points="[737, 166, -643984, -643984]$[657, 166, -643984, -643984]$[657, 106, -643984, -643984]$[737, 106, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vicWEv0EemT5f_Ewhfs6A" id="(0.0,0.8)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vicWUv0EemT5f_Ewhfs6A" id="(0.0,0.2)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vjDUEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDUUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDUkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDU0v0EemT5f_Ewhfs6A" x="21" y="-7"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDVEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDVUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDVkv0EemT5f_Ewhfs6A" x="4" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDV0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDWEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDWUv0EemT5f_Ewhfs6A" x="72" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDWkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDW0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDXEv0EemT5f_Ewhfs6A" x="-32" y="60"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDXUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDXkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDX0v0EemT5f_Ewhfs6A" x="15" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjDYEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjDYUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjDYkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vjDY0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vjDZ0v0EemT5f_Ewhfs6A" points="[357, -112, -643984, -643984]$[137, -112, -643984, -643984]$[137, -72, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjDaEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjDaUv0EemT5f_Ewhfs6A" id="(0.625,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vjqYEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqYUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqYkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqY0v0EemT5f_Ewhfs6A" y="-7"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqZEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqZUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqZkv0EemT5f_Ewhfs6A" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqZ0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqaEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqaUv0EemT5f_Ewhfs6A" x="68" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqakv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqa0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqbEv0EemT5f_Ewhfs6A" x="-68" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqbUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqbkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqb0v0EemT5f_Ewhfs6A" x="14" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vjqcEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vjqcUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vjqckv0EemT5f_Ewhfs6A" x="-15" y="25"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vjqc0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vjqdEv0EemT5f_Ewhfs6A" points="[877, 186, -643984, -643984]$[877, 246, -643984, -643984]$[757, 246, -643984, -643984]$[757, 186, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjqdUv0EemT5f_Ewhfs6A" id="(0.875,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vjqdkv0EemT5f_Ewhfs6A" id="(0.125,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vlfkEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfkUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfkkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfk0v0EemT5f_Ewhfs6A" x="32" y="-5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlflEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlflUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlflkv0EemT5f_Ewhfs6A" x="7"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfl0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfmEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfmUv0EemT5f_Ewhfs6A" x="2" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfmkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfm0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfnEv0EemT5f_Ewhfs6A" x="-2" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfnUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfnkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfn0v0EemT5f_Ewhfs6A" x="17" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfoEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfoUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfokv0EemT5f_Ewhfs6A" x="-26" y="20"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vlfo0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vlfp0v0EemT5f_Ewhfs6A" points="[757, -112, -643984, -643984]$[577, -112, -643984, -643984]$[577, 208, -643984, -643984]$[457, 208, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfqEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfqUv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vlfqkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmtsEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfq0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfrEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfrUv0EemT5f_Ewhfs6A" x="13" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfrkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfr0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfsEv0EemT5f_Ewhfs6A" x="33" y="4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfsUv0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
-        <eAnnotations xmi:id="__vlfskv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
-          <details xmi:id="__vlfs0v0EemT5f_Ewhfs6A" key="visible" value="true"/>
+    <element xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_hb9t7y8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s5C8LEeexxefg2F1i1Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hb9t8C8LEeexxefg2F1i1Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9t8S8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hb9t8i8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t8y8LEeexxefg2F1i1Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t9C8LEeexxefg2F1i1Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_hb9t9S8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9s6C8LEeexxefg2F1i1Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hb9t9i8LEeexxefg2F1i1Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9t9y8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hb9t-C8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t-S8LEeexxefg2F1i1Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9t-i8LEeexxefg2F1i1Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_hb9uli8LEeexxefg2F1i1Q" type="StereotypeCommentLink" target="_hb9tUS8LEeexxefg2F1i1Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hb9uly8LEeexxefg2F1i1Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hb9umC8LEeexxefg2F1i1Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hb9umS8LEeexxefg2F1i1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9umi8LEeexxefg2F1i1Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb9umy8LEeexxefg2F1i1Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vicQEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vicQUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicQkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicQ0v0EemT5f_Ewhfs6A" x="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vicREv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicRUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicRkv0EemT5f_Ewhfs6A" x="3" y="2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vicR0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicSEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicSUv0EemT5f_Ewhfs6A" x="15" y="-82"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vicSkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicS0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicTEv0EemT5f_Ewhfs6A" x="-17" y="-40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vicTUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicTkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicT0v0EemT5f_Ewhfs6A" x="15" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vicUEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vicUUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vicUkv0EemT5f_Ewhfs6A" x="-20" y="-15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vicU0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vicV0v0EemT5f_Ewhfs6A" points="[737, 166, -643984, -643984]$[657, 166, -643984, -643984]$[657, 106, -643984, -643984]$[737, 106, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vicWEv0EemT5f_Ewhfs6A" id="(0.0,0.8)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vicWUv0EemT5f_Ewhfs6A" id="(0.0,0.2)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vjDUEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDUUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDUkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDU0v0EemT5f_Ewhfs6A" x="21" y="-7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDVEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDVUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDVkv0EemT5f_Ewhfs6A" x="4" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDV0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDWEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDWUv0EemT5f_Ewhfs6A" x="72" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDWkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDW0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDXEv0EemT5f_Ewhfs6A" x="-32" y="60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDXUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDXkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDX0v0EemT5f_Ewhfs6A" x="15" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjDYEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjDYUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjDYkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vjDY0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vjDZ0v0EemT5f_Ewhfs6A" points="[357, -112, -643984, -643984]$[137, -112, -643984, -643984]$[137, -72, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjDaEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjDaUv0EemT5f_Ewhfs6A" id="(0.625,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vjqYEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vn76kv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqYUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqYkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqY0v0EemT5f_Ewhfs6A" y="-7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqZEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqZUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqZkv0EemT5f_Ewhfs6A" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqZ0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqaEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqaUv0EemT5f_Ewhfs6A" x="68" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqakv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqa0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqbEv0EemT5f_Ewhfs6A" x="-68" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqbUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqbkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqb0v0EemT5f_Ewhfs6A" x="14" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vjqcEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vjqcUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vjqckv0EemT5f_Ewhfs6A" x="-15" y="25"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vjqc0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vjqdEv0EemT5f_Ewhfs6A" points="[877, 186, -643984, -643984]$[877, 246, -643984, -643984]$[757, 246, -643984, -643984]$[757, 186, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjqdUv0EemT5f_Ewhfs6A" id="(0.875,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vjqdkv0EemT5f_Ewhfs6A" id="(0.125,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vlfkEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfkUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfkkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfk0v0EemT5f_Ewhfs6A" x="32" y="-5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlflEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlflUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlflkv0EemT5f_Ewhfs6A" x="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfl0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfmEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfmUv0EemT5f_Ewhfs6A" x="2" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfmkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfm0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfnEv0EemT5f_Ewhfs6A" x="-2" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfnUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfnkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfn0v0EemT5f_Ewhfs6A" x="17" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfoEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfoUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfokv0EemT5f_Ewhfs6A" x="-26" y="20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vlfo0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vlfp0v0EemT5f_Ewhfs6A" points="[757, -112, -643984, -643984]$[577, -112, -643984, -643984]$[577, 208, -643984, -643984]$[457, 208, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfqEv0EemT5f_Ewhfs6A" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfqUv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vlfqkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmtsEv0EemT5f_Ewhfs6A" target="__vpxNEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfq0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfrEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfrUv0EemT5f_Ewhfs6A" x="13" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfrkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfr0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfsEv0EemT5f_Ewhfs6A" x="33" y="4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfsUv0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__vlfskv0EemT5f_Ewhfs6A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__vlfs0v0EemT5f_Ewhfs6A" key="visible" value="true"/>
         </eAnnotations>
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlftEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlftUv0EemT5f_Ewhfs6A" x="73" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlftkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlft0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfuEv0EemT5f_Ewhfs6A" x="-53" y="15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfuUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfukv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfu0v0EemT5f_Ewhfs6A" x="15" y="14"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfvEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfvUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfvkv0EemT5f_Ewhfs6A" x="-26" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vlfv0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vlfw0v0EemT5f_Ewhfs6A" points="[152, 208, -643984, -643984]$[232, 208, -643984, -643984]$[232, -32, -643984, -643984]$[141, -32, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfxEv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlfxUv0EemT5f_Ewhfs6A" id="(1.0,0.4)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vlfxkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vmGoEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfx0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfyEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfyUv0EemT5f_Ewhfs6A" x="-1" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfykv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfy0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfzEv0EemT5f_Ewhfs6A" x="-14" y="10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlfzUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlfzkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlfz0v0EemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlf0Ev0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlf0Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlf0kv0EemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlf00v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlf1Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlf1Uv0EemT5f_Ewhfs6A" x="9" y="-16"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vlf1kv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vlf10v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vlf2Ev0EemT5f_Ewhfs6A" x="-13" y="-12"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vlf2Uv0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vlf3Uv0EemT5f_Ewhfs6A" points="[533, -227, -643984, -643984]$[398, -227, -643984, -643984]$[398, -152, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlf3kv0EemT5f_Ewhfs6A" id="(0.0,0.2719298245614035)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vlf30v0EemT5f_Ewhfs6A" id="(0.375,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vn70Ev0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vk4gEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn70Uv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn70kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn700v0EemT5f_Ewhfs6A" x="-13" y="8"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn71Ev0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn71Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn71kv0EemT5f_Ewhfs6A" x="-22" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn710v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn72Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn72Uv0EemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn72kv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn720v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn73Ev0EemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn73Uv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn73kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn730v0EemT5f_Ewhfs6A" x="5" y="12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vn74Ev0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vn74Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vn74kv0EemT5f_Ewhfs6A" x="-7" y="18"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vn740v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vn750v0EemT5f_Ewhfs6A" points="[649, -187, -643984, -643984]$[829, -187, -643984, -643984]$[829, -152, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vn76Ev0EemT5f_Ewhfs6A" id="(1.0,0.6228070175438597)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vn76Uv0EemT5f_Ewhfs6A" id="(0.62,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vpxAEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vpxNEv0EemT5f_Ewhfs6A" target="__vmtsEv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxAUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxAkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxA0v0EemT5f_Ewhfs6A" x="-13" y="-5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxBEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxBUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxBkv0EemT5f_Ewhfs6A" x="-33" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxB0v0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxCEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxCUv0EemT5f_Ewhfs6A" x="19" y="-46"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxCkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxC0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxDEv0EemT5f_Ewhfs6A" x="-16" y="65"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxDUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxDkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxD0v0EemT5f_Ewhfs6A" x="13" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxEEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxEUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxEkv0EemT5f_Ewhfs6A" x="-18" y="-12"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vpxE0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vpxF0v0EemT5f_Ewhfs6A" points="[77, 28, -643984, -643984]$[77, 148, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxGEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxGUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vpxGkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxG0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxHEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxHUv0EemT5f_Ewhfs6A" x="-3" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxHkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxH0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxIEv0EemT5f_Ewhfs6A" x="-22" y="9"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxIUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxIkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxI0v0EemT5f_Ewhfs6A" x="21" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxJEv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxJUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxJkv0EemT5f_Ewhfs6A" x="-21" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxJ0v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxKEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxKUv0EemT5f_Ewhfs6A" x="7" y="15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vpxKkv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vpxK0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vpxLEv0EemT5f_Ewhfs6A" x="-22" y="-17"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vpxLUv0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vpxMUv0EemT5f_Ewhfs6A" points="[787, -52, -643984, -643984]$[787, 28, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxMkv0EemT5f_Ewhfs6A" id="(0.5266666666666666,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vpxM0v0EemT5f_Ewhfs6A" id="(0.49375,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__vrmMEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__vrmMUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmMkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmM0v0EemT5f_Ewhfs6A" x="27"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vrmNEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmNUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmNkv0EemT5f_Ewhfs6A" x="7" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vrmN0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmOEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmOUv0EemT5f_Ewhfs6A" x="75" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlftEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlftUv0EemT5f_Ewhfs6A" x="73" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlftkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlft0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfuEv0EemT5f_Ewhfs6A" x="-53" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfuUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfukv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfu0v0EemT5f_Ewhfs6A" x="15" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfvEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfvUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfvkv0EemT5f_Ewhfs6A" x="-26" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vlfv0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vlfw0v0EemT5f_Ewhfs6A" points="[152, 208, -643984, -643984]$[232, 208, -643984, -643984]$[232, -32, -643984, -643984]$[141, -32, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfxEv0EemT5f_Ewhfs6A" id="(1.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlfxUv0EemT5f_Ewhfs6A" id="(1.0,0.4)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vlfxkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vmGoEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfx0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfyEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfyUv0EemT5f_Ewhfs6A" x="-1" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfykv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfy0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfzEv0EemT5f_Ewhfs6A" x="-14" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlfzUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlfzkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlfz0v0EemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlf0Ev0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlf0Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlf0kv0EemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlf00v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlf1Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlf1Uv0EemT5f_Ewhfs6A" x="9" y="-16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vlf1kv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vlf10v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vlf2Ev0EemT5f_Ewhfs6A" x="-13" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vlf2Uv0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vlf3Uv0EemT5f_Ewhfs6A" points="[533, -227, -643984, -643984]$[398, -227, -643984, -643984]$[398, -152, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlf3kv0EemT5f_Ewhfs6A" id="(0.0,0.2719298245614035)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vlf30v0EemT5f_Ewhfs6A" id="(0.375,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vn70Ev0EemT5f_Ewhfs6A" type="Association_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="__vk4gEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn70Uv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn70kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn700v0EemT5f_Ewhfs6A" x="-13" y="8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn71Ev0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn71Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn71kv0EemT5f_Ewhfs6A" x="-22" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn710v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn72Ev0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn72Uv0EemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn72kv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn720v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn73Ev0EemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn73Uv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn73kv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn730v0EemT5f_Ewhfs6A" x="5" y="12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vn74Ev0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vn74Uv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vn74kv0EemT5f_Ewhfs6A" x="-7" y="18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vn740v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vn750v0EemT5f_Ewhfs6A" points="[649, -187, -643984, -643984]$[829, -187, -643984, -643984]$[829, -152, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vn76Ev0EemT5f_Ewhfs6A" id="(1.0,0.6228070175438597)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vn76Uv0EemT5f_Ewhfs6A" id="(0.62,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vpxAEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vpxNEv0EemT5f_Ewhfs6A" target="__vmtsEv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxAUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxAkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxA0v0EemT5f_Ewhfs6A" x="-13" y="-5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxBEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxBUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxBkv0EemT5f_Ewhfs6A" x="-33" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxB0v0EemT5f_Ewhfs6A" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxCEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxCUv0EemT5f_Ewhfs6A" x="19" y="-46"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxCkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxC0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxDEv0EemT5f_Ewhfs6A" x="-16" y="65"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxDUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxDkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxD0v0EemT5f_Ewhfs6A" x="13" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxEEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxEUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxEkv0EemT5f_Ewhfs6A" x="-18" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vpxE0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vpxF0v0EemT5f_Ewhfs6A" points="[77, 28, -643984, -643984]$[77, 148, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxGEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxGUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vpxGkv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vk4gEv0EemT5f_Ewhfs6A" target="__vn76kv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxG0v0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxHEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxHUv0EemT5f_Ewhfs6A" x="-3" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxHkv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxH0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxIEv0EemT5f_Ewhfs6A" x="-22" y="9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxIUv0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxIkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxI0v0EemT5f_Ewhfs6A" x="21" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxJEv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxJUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxJkv0EemT5f_Ewhfs6A" x="-21" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxJ0v0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxKEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxKUv0EemT5f_Ewhfs6A" x="7" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vpxKkv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vpxK0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vpxLEv0EemT5f_Ewhfs6A" x="-22" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vpxLUv0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vpxMUv0EemT5f_Ewhfs6A" points="[787, -52, -643984, -643984]$[787, 28, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxMkv0EemT5f_Ewhfs6A" id="(0.5266666666666666,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vpxM0v0EemT5f_Ewhfs6A" id="(0.49375,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__vrmMEv0EemT5f_Ewhfs6A" type="Association_Edge" source="__vmGoEv0EemT5f_Ewhfs6A" target="__vjDakv0EemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__vrmMUv0EemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmMkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmM0v0EemT5f_Ewhfs6A" x="27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vrmNEv0EemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmNUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmNkv0EemT5f_Ewhfs6A" x="7" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vrmN0v0EemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmOEv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmOUv0EemT5f_Ewhfs6A" x="75" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vrmOkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmO0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmPEv0EemT5f_Ewhfs6A" x="-75" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vrmOkv0EemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmO0v0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmPEv0EemT5f_Ewhfs6A" x="-75" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vrmPUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmPkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmP0v0EemT5f_Ewhfs6A" x="7" y="15"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vrmPUv0EemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmPkv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmP0v0EemT5f_Ewhfs6A" x="7" y="15"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__vrmQEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__vrmQUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__vrmQkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__vrmQEv0EemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vrmQUv0EemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vrmQkv0EemT5f_Ewhfs6A" x="-13" y="16"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__vrmQ0v0EemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__vrmR0v0EemT5f_Ewhfs6A" points="[417, -52, -643984, -643984]$[417, 148, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vrmSEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__vrmSUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="__vrmQ0v0EemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vrmR0v0EemT5f_Ewhfs6A" points="[417, -52, -643984, -643984]$[417, 148, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vrmSEv0EemT5f_Ewhfs6A" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vrmSUv0EemT5f_Ewhfs6A" id="(0.5,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_iQgZkFolEemu443YKSGnxQ" type="Dependency_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="_iEA1sFolEemu443YKSGnxQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_iQgZk1olEemu443YKSGnxQ" type="Dependency_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jIJzQFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iQgZlFolEemu443YKSGnxQ" x="-10" y="-13"/>
+    <edges xmi:type="notation:Connector" xmi:id="_iQgZkFolEemu443YKSGnxQ" type="Dependency_Edge" source="__vjqd0v0EemT5f_Ewhfs6A" target="_iEA1sFolEemu443YKSGnxQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iQgZk1olEemu443YKSGnxQ" type="Dependency_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jIJzQFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iQgZlFolEemu443YKSGnxQ" x="-10" y="-13"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iQgZlVolEemu443YKSGnxQ" type="Dependency_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jPl4AFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iQgZllolEemu443YKSGnxQ" x="-1" y="8"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iQgZlVolEemu443YKSGnxQ" type="Dependency_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jPl4AFolEemu443YKSGnxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iQgZllolEemu443YKSGnxQ" x="-1" y="8"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_iQgZkVolEemu443YKSGnxQ"/>
-      <element href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_iQgZklolEemu443YKSGnxQ" points="[533, -188, -643984, -643984]$[0, 0, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jXxjoFolEemu443YKSGnxQ" id="(1.0,0.21929824561403508)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jXxjoVolEemu443YKSGnxQ" id="(0.0,0.4177215189873418)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_iQgZkVolEemu443YKSGnxQ"/>
+      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iQgZklolEemu443YKSGnxQ" points="[533, -188, -643984, -643984]$[0, 0, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jXxjoFolEemu443YKSGnxQ" id="(1.0,0.21929824561403508)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jXxjoVolEemu443YKSGnxQ" id="(0.0,0.4177215189873418)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XqjNhB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDakv0EemT5f_Ewhfs6A" target="_XqjNgB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XqjNhR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XqjNiR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XqjNhB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDakv0EemT5f_Ewhfs6A" target="_XqjNgB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XqjNhR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XqjNiR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XqjNhh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XqjNhx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XqjNiB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XqjNhh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XqjNhx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XqjNiB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XrQYJB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqd0v0EemT5f_Ewhfs6A" target="_XrQYIB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XrQYJR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrQYKR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XrQYJB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqd0v0EemT5f_Ewhfs6A" target="_XrQYIB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XrQYJR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrQYKR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XrQYJh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrQYJx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrQYKB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XrQYJh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrQYJx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrQYKB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xrqn1B0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfxkv0EemT5f_Ewhfs6A" target="_Xrqn0B0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xrqn1R0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xrqn2R0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xrqn1B0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfxkv0EemT5f_Ewhfs6A" target="_Xrqn0B0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xrqn1R0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xrqn2R0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xrqn1h0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xrqn1x0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xrqn2B0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xrqn1h0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xrqn1x0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xrqn2B0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XrzKtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn70Ev0EemT5f_Ewhfs6A" target="_XrzKsB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XrzKtR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XrzKuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XrzKtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn70Ev0EemT5f_Ewhfs6A" target="_XrzKsB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XrzKtR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XrzKuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XrzKth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrzKtx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XrzKuB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XrzKth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrzKtx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XrzKuB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xr4qRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iQgZkFolEemu443YKSGnxQ" target="_Xr4qQB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xr4qRR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xr4qSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xr4qRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iQgZkFolEemu443YKSGnxQ" target="_Xr4qQB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xr4qRR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xr4qSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xr4qRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xr4qRx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xr4qSB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xr4qRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xr4qRx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xr4qSB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XsaOtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vk4gEv0EemT5f_Ewhfs6A" target="_XsaOsB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XsaOtR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XsaOuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XsaOtB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vk4gEv0EemT5f_Ewhfs6A" target="_XsaOsB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XsaOtR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XsaOuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XsaOth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XsaOtx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XsaOuB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XsaOth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XsaOtx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XsaOuB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XszQRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfkEv0EemT5f_Ewhfs6A" target="_XszQQB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XszQRR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XszQSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XszQRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfkEv0EemT5f_Ewhfs6A" target="_XszQQB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XszQRR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XszQSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XszQRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XszQRx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XszQSB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XszQRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XszQRx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XszQSB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xs7MFB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxGkv0EemT5f_Ewhfs6A" target="_Xs7MEB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xs7MFR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xs7MGR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xs7MFB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxGkv0EemT5f_Ewhfs6A" target="_Xs7MEB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xs7MFR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xs7MGR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xs7MFh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xs7MFx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xs7MGB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xs7MFh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xs7MFx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xs7MGB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XtnIkB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmGoEv0EemT5f_Ewhfs6A" target="_XtmhgB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XtnIkR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XtnIlR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XtnIkB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmGoEv0EemT5f_Ewhfs6A" target="_XtmhgB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XtnIkR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XtnIlR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XtnIkh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XtnIkx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XtnIlB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XtnIkh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtnIkx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtnIlB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xt74tB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDUEv0EemT5f_Ewhfs6A" target="_Xt74sB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xt74tR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xt74uR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xt74tB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjDUEv0EemT5f_Ewhfs6A" target="_Xt74sB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xt74tR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xt74uR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xt74th0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xt74tx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xt74uB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xt74th0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xt74tx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xt74uB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XuFptB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vrmMEv0EemT5f_Ewhfs6A" target="_XuFpsB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XuFptR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuFpuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XuFptB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vrmMEv0EemT5f_Ewhfs6A" target="_XuFpsB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XuFptR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuFpuR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XuFpth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuFptx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuFpuB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XuFpth0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuFptx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuFpuB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XuocRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmtsEv0EemT5f_Ewhfs6A" target="_XuocQB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XuocRR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XuocSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XuocRB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vmtsEv0EemT5f_Ewhfs6A" target="_XuocQB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XuocRR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XuocSR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XuocRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuocRx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XuocSB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XuocRh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuocRx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XuocSB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xu7XNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfqkv0EemT5f_Ewhfs6A" target="_Xu7XMB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xu7XNR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xu7XOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xu7XNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vlfqkv0EemT5f_Ewhfs6A" target="_Xu7XMB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xu7XNR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xu7XOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xu7XNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xu7XNx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xu7XOB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xu7XNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xu7XNx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xu7XOB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XvibNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn76kv0EemT5f_Ewhfs6A" target="_XvibMB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XvibNR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XvibOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XvibNB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vn76kv0EemT5f_Ewhfs6A" target="_XvibMB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XvibNR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XvibOR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XvibNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XvibNx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XvibOB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XvibNh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XvibNx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XvibOB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xv4ZdB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vicQEv0EemT5f_Ewhfs6A" target="_Xv4ZcB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xv4ZdR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv4ZeR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xv4ZdB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vicQEv0EemT5f_Ewhfs6A" target="_Xv4ZcB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xv4ZdR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv4ZeR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xv4Zdh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv4Zdx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv4ZeB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xv4Zdh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv4Zdx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv4ZeB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xv-gER0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqYEv0EemT5f_Ewhfs6A" target="_Xv95AB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xv-gEh0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xv-gFh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xv-gER0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vjqYEv0EemT5f_Ewhfs6A" target="_Xv95AB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xv-gEh0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xv-gFh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xv-gEx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv-gFB0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xv-gFR0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xv-gEx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv-gFB0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xv-gFR0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XwgrlB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxNEv0EemT5f_Ewhfs6A" target="_XwgrkB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XwgrlR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XwgrmR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XwgrlB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxNEv0EemT5f_Ewhfs6A" target="_XwgrkB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XwgrlR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XwgrmR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xwgrlh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xwgrlx0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XwgrmB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xwgrlh0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xwgrlx0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XwgrmB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xw00pB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxAEv0EemT5f_Ewhfs6A" target="_Xw00oB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xw00pR0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xw00qR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xw00pB0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="__vpxAEv0EemT5f_Ewhfs6A" target="_Xw00oB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xw00pR0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xw00qR0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xw00ph0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xw00px0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xw00qB0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xw00ph0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xw00px0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xw00qB0zEeqCFrodiWelgQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XxaDcR0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iEA1sFolEemu443YKSGnxQ" target="_XxZcYB0zEeqCFrodiWelgQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XxaDch0zEeqCFrodiWelgQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxaDdh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XxaDcR0zEeqCFrodiWelgQ" type="StereotypeCommentLink" source="_iEA1sFolEemu443YKSGnxQ" target="_XxZcYB0zEeqCFrodiWelgQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XxaDch0zEeqCFrodiWelgQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XxaDdh0zEeqCFrodiWelgQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XxaDcx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxaDdB0zEeqCFrodiWelgQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxaDdR0zEeqCFrodiWelgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XxaDcx0zEeqCFrodiWelgQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XxaDdB0zEeqCFrodiWelgQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XxaDdR0zEeqCFrodiWelgQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_UDyhIES5Eem_eeeaz1ENMQ" type="PapyrusUMLClassDiagram" name="EquipmentModelDetail" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_Yvs2oES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="12621752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2oUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_xtfggDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs2okS5Eem_eeeaz1ENMQ" x="-58" y="-17" width="341" height="21"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Yvs210S5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs22ES5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs22US5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs22kS5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvs220S5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_Yvs23ES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_Yvs23US5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+    <children xmi:type="notation:Shape" xmi:id="_Yvs2oES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2oUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_xtfggDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs2okS5Eem_eeeaz1ENMQ" x="-58" y="-17" width="341" height="21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Yvs210S5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs22ES5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs22US5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs22kS5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvs220S5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvs23ES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvs23US5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvs23kS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvs230S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvs24ES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs24US5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvs24kS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvs240S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvs25ES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvs25US5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs25kS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvs250S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvs26ES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvs26US5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvs26kS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs260S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvs3FUS5Eem_eeeaz1ENMQ" x="1371" y="598" width="141"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Yvur1US5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvur1kS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvur10S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvur2ES5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvur2US5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_Yvur2kS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_Yvur20S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvs23kS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvs230S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvs24ES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs24US5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvs24kS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvs240S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvs25ES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvs25US5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs25kS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvs250S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvs26ES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvs26US5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvs26kS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs260S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvs3FUS5Eem_eeeaz1ENMQ" x="1371" y="598" width="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Yvur1US5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvur1kS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvur10S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvur2ES5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvur2US5Eem_eeeaz1ENMQ" visible="false" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvur2kS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvur20S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvur3ES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvur3US5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvur3kS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvur30S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvur4ES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvur4US5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvur4kS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvur40S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvur5ES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvur5US5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvur5kS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvur50S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvur6ES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvur6US5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvusE0S5Eem_eeeaz1ENMQ" x="1371" y="58" width="141"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_YvusfES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvusfUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvusfkS5Eem_eeeaz1ENMQ" x="-58" y="-97" width="341" height="21"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_YvvTPUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvvTPkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvvTP0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvvTQES5Eem_eeeaz1ENMQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_YvvTQUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_YvvTQkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_YvvTQ0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvur3ES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvur3US5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvur3kS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvur30S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvur4ES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvur4US5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvur4kS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvur40S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvur5ES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvur5US5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvur5kS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvur50S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvur6ES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvur6US5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvusE0S5Eem_eeeaz1ENMQ" x="1371" y="58" width="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YvusfES5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvusfUS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvusfkS5Eem_eeeaz1ENMQ" x="-58" y="-97" width="341" height="21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YvvTPUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvvTPkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvvTP0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvvTQES5Eem_eeeaz1ENMQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YvvTQUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YvvTQkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YvvTQ0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="_w2HjYETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_w2HjYUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_0XD6kETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_0XD6kUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_1fvZ4ETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_1fvZ4UTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_2oP6EETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_2oP6EUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_3y3TEETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_3y3TEUTBEem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_FiA4YEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_FiA4YUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TiAoYEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TiAoYUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_7GGYQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_7GGYQVFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_7GG_UFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_7GG_UVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_YvvTRES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_YvvTRUS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_YvvTRkS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTR0S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_YvvTSES5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_YvvTSUS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_YvvTSkS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_YvvTS0S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTTES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_YvvTTUS5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_YvvTTkS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_YvvTT0S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_YvvTUES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTUUS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvvTc0S5Eem_eeeaz1ENMQ" x="-1" y="100" width="402" height="285"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Yvv6IUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6IkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6I0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvv6JES5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvv6JUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_Yvv6JkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_Yvv6J0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="_w2HjYETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_w2HjYUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_0XD6kETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_0XD6kUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1fvZ4ETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1fvZ4UTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2oP6EETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2oP6EUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_3y3TEETBEem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_3y3TEUTBEem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_FiA4YEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_FiA4YUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TiAoYEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TiAoYUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_7GGYQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_7GGYQVFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_7GG_UFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_7GG_UVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YvvTRES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YvvTRUS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YvvTRkS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTR0S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YvvTSES5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YvvTSUS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YvvTSkS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YvvTS0S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTTES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YvvTTUS5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YvvTTkS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YvvTT0S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YvvTUES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTUUS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvvTc0S5Eem_eeeaz1ENMQ" x="-1" y="100" width="402" height="285"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Yvv6IUS5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6IkS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6I0S5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvv6JES5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvv6JUS5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvv6JkS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvv6J0S5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="_VS82AElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_VS82AUlmEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Wivp8ElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Wivp8UlmEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_xMlVcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_xMlVcVFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_xMmjkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_xMmjkVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvv6KES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvv6KUS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvv6KkS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6K0S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvv6LES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvv6LUS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvv6LkS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvv6L0S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6MES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvv6MUS5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvv6MkS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvv6M0S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvv6NES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6NUS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvv6V0S5Eem_eeeaz1ENMQ" x="828" y="40" width="413" height="127"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_YvwhXUS5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="13420443">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhXkS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YvwhX0S5Eem_eeeaz1ENMQ" x="-58" y="23" width="340" height="20"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Yvy9QES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9QUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9QkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvy9Q0S5Eem_eeeaz1ENMQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9RES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_Yvy9RUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_Yvy9RkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="_VS82AElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_xJV5gVRPEeiyzdV8zVsJ_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VS82AUlmEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Wivp8ElmEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_PshE4ElZEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Wivp8UlmEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_xMlVcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xMlVcVFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_xMmjkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xMmjkVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvv6KES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvv6KUS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvv6KkS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6K0S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvv6LES5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvv6LUS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvv6LkS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvv6L0S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6MES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvv6MUS5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvv6MkS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvv6M0S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvv6NES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6NUS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvv6V0S5Eem_eeeaz1ENMQ" x="828" y="40" width="413" height="127"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YvwhXUS5Eem_eeeaz1ENMQ" type="Comment_Shape" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhXkS5Eem_eeeaz1ENMQ" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvwhX0S5Eem_eeeaz1ENMQ" x="-58" y="23" width="340" height="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Yvy9QES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9QUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9QkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvy9Q0S5Eem_eeeaz1ENMQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9RES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvy9RUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvy9RkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="_nBARsES8Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_nBARsUS8Eem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_w0JswEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_w0JswUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="__UZDEEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="__UZDEUvNEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_5NAIoFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_5NAIoVFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_5NAIolFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_5NAIo1FgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9R0S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9SES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9SUS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9SkS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9S0S5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9TES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9TUS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9TkS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9T0S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9UES5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9UUS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9UkS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9U0S5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9VES5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9dkS5Eem_eeeaz1ENMQ" x="-60" y="587" width="481" height="214"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Yvy9qES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9qUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvy9qkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvy9q0S5Eem_eeeaz1ENMQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9rES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_Yvy9rUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_Yvy9rkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="_nBARsES8Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_nBARsUS8Eem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_w0JswEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_w0JswUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="__UZDEEvNEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="__UZDEUvNEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_5NAIoFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5NAIoVFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_5NAIolFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5NAIo1FgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9R0S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9SES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9SUS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9SkS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9S0S5Eem_eeeaz1ENMQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9TES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9TUS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9TkS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9T0S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9UES5Eem_eeeaz1ENMQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9UUS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9UkS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9U0S5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9VES5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9dkS5Eem_eeeaz1ENMQ" x="-60" y="587" width="481" height="214"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Yvy9qES5Eem_eeeaz1ENMQ" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9qUS5Eem_eeeaz1ENMQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvy9qkS5Eem_eeeaz1ENMQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvy9q0S5Eem_eeeaz1ENMQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9rES5Eem_eeeaz1ENMQ" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yvy9rUS5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yvy9rkS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="_Yvy9r0S5Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvy9yUS5Eem_eeeaz1ENMQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_1rg-4FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_1rg-4VFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_1ri0EFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_1ri0EVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9ykS5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy9y0S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy9zES5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9zUS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy9zkS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy9z0S5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy90ES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy90US5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy90kS5Eem_eeeaz1ENMQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Yvy900S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Yvy91ES5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Yvy91US5Eem_eeeaz1ENMQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Yvy91kS5Eem_eeeaz1ENMQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy910S5Eem_eeeaz1ENMQ"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yvy9-US5Eem_eeeaz1ENMQ" x="438" y="594" width="381" height="147"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ESGL0ElgEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ESGL0klgEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ESGL00lgEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ESGL1ElgEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ESGL1UlgEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_afbM0ElkEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_afbM0UlkEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_xbbZEEllEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_xbbZEUllEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_ikqcUEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_ikqcUUvaEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_jbpHoEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_jbpHoUvaEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_zk1mQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_zk1mQVFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_zk2NUFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_zk2NUVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ESGL1klgEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ESGL10lgEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ESGL2ElgEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL2UlgEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ESGL2klgEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ESGL20lgEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ESGL3ElgEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ESGL3UlgEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL3klgEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ESGL30lgEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ESGL4ElgEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ESGL4UlgEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ESGL4klgEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL40lgEemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ESGL0UlgEemT5f_Ewhfs6A" x="882" y="343" width="401" height="136"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_87cVEElkEemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_87cVEklkEemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_87cVEUlkEemT5f_Ewhfs6A" x="-58" y="-57" width="341" height="21"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_dOMqwEvWEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_dOMqwkvWEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dOMqw0vWEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dOMqxEvWEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_dOMqxUvWEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_Ai8VUEvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ai8VUUvYEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Bhvf4EvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Bhvf4UvYEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_vGYd8FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_vGYd8VFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_vGYd8lFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_vGYd81FgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_dOMqxkvWEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_dOMqx0vWEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_dOMqyEvWEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dOMqyUvWEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_dONR0EvWEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_dONR0UvWEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_dONR0kvWEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_dONR00vWEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dONR1EvWEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_dONR1UvWEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_dONR1kvWEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_dONR10vWEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_dONR2EvWEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dONR2UvWEemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dOMqwUvWEemT5f_Ewhfs6A" x="520" y="-18" width="281" height="159"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_gPB_sEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_gPB_skvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_gPB_s0vwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_gPB_tEvwEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_gPB_tUvwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_kkeEAEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_kkeEAUvyEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_lZxUUEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_lZxUUUvyEemT5f_Ewhfs6A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_soYKcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_soYKcVFgEemgMYGocegK5A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_soZYkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_soZYkVFgEemgMYGocegK5A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_gPB_tkvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_gPB_t0vwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_gPB_uEvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_uUvwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_gPB_ukvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_gPB_u0vwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_gPB_vEvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_gPB_vUvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_vkvwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_gPB_v0vwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_gPB_wEvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_gPB_wUvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_gPB_wkvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_w0vwEemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gPB_sUvwEemT5f_Ewhfs6A" x="682" y="-262" width="301" height="113"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_7M57YEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12621752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_7M6icEvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_7M6icUvwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7M6ickvwEemT5f_Ewhfs6A" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_7M6ic0vwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_7M6idEvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_7M6idUvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_7M6idkvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M6id0vwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_7M6ieEvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_7M6ieUvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_7M6iekvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_7M6ie0vwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M6ifEvwEemT5f_Ewhfs6A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_7M6ifUvwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_7M6ifkvwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_7M6if0vwEemT5f_Ewhfs6A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_7M6igEvwEemT5f_Ewhfs6A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M6igUvwEemT5f_Ewhfs6A"/>
-      </children>
-      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7M57YUvwEemT5f_Ewhfs6A" x="1371" y="-262" width="141"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_4jT6oE2rEemQQPVBE79CWA" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_4jaBQE2rEemQQPVBE79CWA" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4jaBQU2rEemQQPVBE79CWA" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4jaBQk2rEemQQPVBE79CWA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_4jaoUE2rEemQQPVBE79CWA" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_ZEoQwE2sEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_6B6BtS7BEemaZq0-6SfFXw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_ZEoQwU2sEemQQPVBE79CWA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_4jaoUU2rEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_4jaoUk2rEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_4jaoU02rEemQQPVBE79CWA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jaoVE2rEemQQPVBE79CWA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_4jaoVU2rEemQQPVBE79CWA" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_4jaoVk2rEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_4jaoV02rEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_4jaoWE2rEemQQPVBE79CWA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jaoWU2rEemQQPVBE79CWA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_4jbPYE2rEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_4jbPYU2rEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_4jbPYk2rEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_4jbPY02rEemQQPVBE79CWA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jbPZE2rEemQQPVBE79CWA"/>
-      </children>
-      <element href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4jT6oU2rEemQQPVBE79CWA" x="1124" y="-100" height="109"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_8PgDEE2sEemQQPVBE79CWA" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_8PhRME2sEemQQPVBE79CWA" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8PhRMU2sEemQQPVBE79CWA" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8PhRMk2sEemQQPVBE79CWA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_8PhRM02sEemQQPVBE79CWA" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_Pai7oE2tEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_Aw6nkTlbEemDl_QGWIY6yg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Pai7oU2tEemQQPVBE79CWA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_8PhRNE2sEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_8PhRNU2sEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_8PhRNk2sEemQQPVBE79CWA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8PhRN02sEemQQPVBE79CWA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_8Ph4QE2sEemQQPVBE79CWA" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_8Ph4QU2sEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_8Ph4Qk2sEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_8Ph4Q02sEemQQPVBE79CWA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8Ph4RE2sEemQQPVBE79CWA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_8Ph4RU2sEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_8Ph4Rk2sEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_8Ph4R02sEemQQPVBE79CWA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_8Ph4SE2sEemQQPVBE79CWA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8Ph4SU2sEemQQPVBE79CWA"/>
-      </children>
-      <element href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8PgDEU2sEemQQPVBE79CWA" x="1055" y="617" height="61"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_EM33QHspEemfSIWqmJMEQA" type="Interface_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_EM33QnspEemfSIWqmJMEQA" type="Interface_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_EM33Q3spEemfSIWqmJMEQA" type="Interface_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EM33RHspEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_EM33RXspEemfSIWqmJMEQA" type="Interface_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_EM33RnspEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_EM33R3spEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_EM33SHspEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33SXspEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_EM33SnspEemfSIWqmJMEQA" type="Interface_OperationCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_XY8twHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_omJZkHstEemfSIWqmJMEQA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_Yvy9r0S5Eem_eeeaz1ENMQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_LcVo0DmlEemDl_QGWIY6yg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvy9yUS5Eem_eeeaz1ENMQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1rg-4FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1rg-4VFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1ri0EFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1ri0EVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9ykS5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy9y0S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy9zES5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9zUS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy9zkS5Eem_eeeaz1ENMQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy9z0S5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy90ES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy90US5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy90kS5Eem_eeeaz1ENMQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Yvy900S5Eem_eeeaz1ENMQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Yvy91ES5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Yvy91US5Eem_eeeaz1ENMQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Yvy91kS5Eem_eeeaz1ENMQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy910S5Eem_eeeaz1ENMQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yvy9-US5Eem_eeeaz1ENMQ" x="438" y="594" width="381" height="147"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ESGL0ElgEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ESGL0klgEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ESGL00lgEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ESGL1ElgEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ESGL1UlgEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_afbM0ElkEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Z2xRYElkEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_afbM0UlkEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_xbbZEEllEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_3a-T8ElVEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xbbZEUllEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ikqcUEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Ljmqk0lgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ikqcUUvaEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_jbpHoEvaEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VSkDMElgEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_jbpHoUvaEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_zk1mQFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_zk1mQVFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_zk2NUFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_zk2NUVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ESGL1klgEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ESGL10lgEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ESGL2ElgEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL2UlgEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ESGL2klgEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ESGL20lgEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ESGL3ElgEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ESGL3UlgEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL3klgEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ESGL30lgEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ESGL4ElgEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ESGL4UlgEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ESGL4klgEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL40lgEemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ESGL0UlgEemT5f_Ewhfs6A" x="882" y="343" width="401" height="136"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_87cVEElkEemT5f_Ewhfs6A" type="Comment_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_87cVEklkEemT5f_Ewhfs6A" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87cVEUlkEemT5f_Ewhfs6A" x="-58" y="-57" width="341" height="21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dOMqwEvWEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dOMqwkvWEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dOMqw0vWEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dOMqxEvWEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dOMqxUvWEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_Ai8VUEvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_V19cckvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ai8VUUvYEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Bhvf4EvYEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_S0xjYEvXEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bhvf4UvYEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_vGYd8FFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vGYd8VFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_vGYd8lFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vGYd81FgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dOMqxkvWEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dOMqx0vWEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dOMqyEvWEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dOMqyUvWEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dONR0EvWEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dONR0UvWEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dONR0kvWEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dONR00vWEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dONR1EvWEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dONR1UvWEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dONR1kvWEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dONR10vWEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dONR2EvWEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dONR2UvWEemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dOMqwUvWEemT5f_Ewhfs6A" x="520" y="-18" width="281" height="159"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_gPB_sEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gPB_skvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gPB_s0vwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gPB_tEvwEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gPB_tUvwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_kkeEAEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-o7g4kvxEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kkeEAUvyEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_lZxUUEvyEemT5f_Ewhfs6A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_DN0oYkvyEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_lZxUUUvyEemT5f_Ewhfs6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_soYKcFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_soYKcVFgEemgMYGocegK5A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_soZYkFFgEemgMYGocegK5A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_soZYkVFgEemgMYGocegK5A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gPB_tkvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gPB_t0vwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gPB_uEvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_uUvwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gPB_ukvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gPB_u0vwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gPB_vEvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gPB_vUvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_vkvwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gPB_v0vwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gPB_wEvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gPB_wUvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gPB_wkvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_w0vwEemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gPB_sUvwEemT5f_Ewhfs6A" x="682" y="-262" width="301" height="113"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7M57YEvwEemT5f_Ewhfs6A" type="Class_Shape" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_7M6icEvwEemT5f_Ewhfs6A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7M6icUvwEemT5f_Ewhfs6A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7M6ickvwEemT5f_Ewhfs6A" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7M6ic0vwEemT5f_Ewhfs6A" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7M6idEvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7M6idUvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7M6idkvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M6id0vwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7M6ieEvwEemT5f_Ewhfs6A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7M6ieUvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7M6iekvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7M6ie0vwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M6ifEvwEemT5f_Ewhfs6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7M6ifUvwEemT5f_Ewhfs6A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7M6ifkvwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7M6if0vwEemT5f_Ewhfs6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7M6igEvwEemT5f_Ewhfs6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M6igUvwEemT5f_Ewhfs6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7M57YUvwEemT5f_Ewhfs6A" x="1371" y="-262" width="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_4jT6oE2rEemQQPVBE79CWA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4jaBQE2rEemQQPVBE79CWA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4jaBQU2rEemQQPVBE79CWA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4jaBQk2rEemQQPVBE79CWA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4jaoUE2rEemQQPVBE79CWA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_ZEoQwE2sEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_6B6BtS7BEemaZq0-6SfFXw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZEoQwU2sEemQQPVBE79CWA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4jaoUU2rEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4jaoUk2rEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4jaoU02rEemQQPVBE79CWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jaoVE2rEemQQPVBE79CWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4jaoVU2rEemQQPVBE79CWA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4jaoVk2rEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4jaoV02rEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4jaoWE2rEemQQPVBE79CWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jaoWU2rEemQQPVBE79CWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4jbPYE2rEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4jbPYU2rEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4jbPYk2rEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4jbPY02rEemQQPVBE79CWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jbPZE2rEemQQPVBE79CWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jT6oU2rEemQQPVBE79CWA" x="1124" y="-100" height="109"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_8PgDEE2sEemQQPVBE79CWA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8PhRME2sEemQQPVBE79CWA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8PhRMU2sEemQQPVBE79CWA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8PhRMk2sEemQQPVBE79CWA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8PhRM02sEemQQPVBE79CWA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_Pai7oE2tEemQQPVBE79CWA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Aw6nkTlbEemDl_QGWIY6yg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Pai7oU2tEemQQPVBE79CWA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8PhRNE2sEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8PhRNU2sEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8PhRNk2sEemQQPVBE79CWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PhRN02sEemQQPVBE79CWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8Ph4QE2sEemQQPVBE79CWA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8Ph4QU2sEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8Ph4Qk2sEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8Ph4Q02sEemQQPVBE79CWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Ph4RE2sEemQQPVBE79CWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8Ph4RU2sEemQQPVBE79CWA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8Ph4Rk2sEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8Ph4R02sEemQQPVBE79CWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8Ph4SE2sEemQQPVBE79CWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Ph4SU2sEemQQPVBE79CWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PgDEU2sEemQQPVBE79CWA" x="1055" y="617" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EM33QHspEemfSIWqmJMEQA" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EM33QnspEemfSIWqmJMEQA" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EM33Q3spEemfSIWqmJMEQA" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EM33RHspEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EM33RXspEemfSIWqmJMEQA" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EM33RnspEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EM33R3spEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EM33SHspEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33SXspEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EM33SnspEemfSIWqmJMEQA" type="Interface_OperationCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_XY8twHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_omJZkHstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1561,11 +1561,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiEquipment.uml#_FCC50HsrEemfSIWqmJMEQA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8twXstEemfSIWqmJMEQA"/>
+          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_FCC50HsrEemfSIWqmJMEQA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8twXstEemfSIWqmJMEQA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_XY8twnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_peFHIHstEemfSIWqmJMEQA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_XY8twnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_peFHIHstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1574,11 +1574,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiEquipment.uml#_nJXkcHsrEemfSIWqmJMEQA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8tw3stEemfSIWqmJMEQA"/>
+          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_nJXkcHsrEemfSIWqmJMEQA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8tw3stEemfSIWqmJMEQA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_XY8txHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_qfPpMHstEemfSIWqmJMEQA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_XY8txHstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_qfPpMHstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1587,11 +1587,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiEquipment.uml#_R3dQkHssEemfSIWqmJMEQA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8txXstEemfSIWqmJMEQA"/>
+          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_R3dQkHssEemfSIWqmJMEQA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8txXstEemfSIWqmJMEQA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_XY8txnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_rKry4HstEemfSIWqmJMEQA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_XY8txnstEemfSIWqmJMEQA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_rKry4HstEemfSIWqmJMEQA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -1600,2098 +1600,2098 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiEquipment.uml#_SHEkcHstEemfSIWqmJMEQA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_XY8tx3stEemfSIWqmJMEQA"/>
+          <element xmi:type="uml:Operation" href="TapiEquipment.uml#_SHEkcHstEemfSIWqmJMEQA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XY8tx3stEemfSIWqmJMEQA"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_EM33S3spEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_EM33THspEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_EM33TXspEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33TnspEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EM33S3spEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EM33THspEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EM33TXspEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33TnspEemfSIWqmJMEQA"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_EM33T3spEemfSIWqmJMEQA" type="Interface_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_EM33UHspEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_EM33UXspEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_EM33UnspEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33U3spEemfSIWqmJMEQA"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EM33T3spEemfSIWqmJMEQA" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EM33UHspEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EM33UXspEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EM33UnspEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33U3spEemfSIWqmJMEQA"/>
       </children>
-      <element href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_EM33QXspEemfSIWqmJMEQA" x="45" y="-300" height="181"/>
+      <element xmi:type="uml:Interface" href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EM33QXspEemfSIWqmJMEQA" x="45" y="-300" height="181"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UNmwAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UNmwAaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UNmwA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_UNmwAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UNmwAaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UNmwA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UNmwAqawEeqJcvXkREZ1XQ" x="1571" y="598"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNmwAqawEeqJcvXkREZ1XQ" x="1571" y="598"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UOKwsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UOKwsaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UOLXwKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_UOKwsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UOKwsaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UOLXwKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UOKwsqawEeqJcvXkREZ1XQ" x="1571" y="58"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UOKwsqawEeqJcvXkREZ1XQ" x="1571" y="58"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UO5wgKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UO5wgaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UO5wg6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UO5wgKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UO5wgaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UO5wg6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UO5wgqawEeqJcvXkREZ1XQ" x="199" y="100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UO5wgqawEeqJcvXkREZ1XQ" x="199" y="100"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UQK70KawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UQK70aawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQK706awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UQK70KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UQK70aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQK706awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UQK70qawEeqJcvXkREZ1XQ" x="199"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UQK70qawEeqJcvXkREZ1XQ" x="199"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UQ57oKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UQ57oaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQ57o6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <children xmi:type="notation:Shape" xmi:id="_UQ57oKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UQ57oaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQ57o6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UQ57oqawEeqJcvXkREZ1XQ" x="1028" y="40"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UQ57oqawEeqJcvXkREZ1XQ" x="1028" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_URtz8KawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_URtz8aawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_URtz86awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <children xmi:type="notation:Shape" xmi:id="_URtz8KawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_URtz8aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_URtz86awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_URtz8qawEeqJcvXkREZ1XQ" x="1028" y="-60"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_URtz8qawEeqJcvXkREZ1XQ" x="1028" y="-60"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UR6oQKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UR6oQaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UR6oQ6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UR6oQKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UR6oQaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UR6oQ6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UR6oQqawEeqJcvXkREZ1XQ" x="1028" y="-60"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UR6oQqawEeqJcvXkREZ1XQ" x="1028" y="-60"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UShFMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UShFMaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UShFM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UShFMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UShFMaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UShFM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UShFMqawEeqJcvXkREZ1XQ" x="140" y="587"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UShFMqawEeqJcvXkREZ1XQ" x="140" y="587"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UTjnAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UTjnAaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UTjnA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UTjnAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UTjnAaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UTjnA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UTjnAqawEeqJcvXkREZ1XQ" x="140" y="487"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UTjnAqawEeqJcvXkREZ1XQ" x="140" y="487"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UUVqIKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UUVqIaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UUVqI6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UUVqIKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UUVqIaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UUVqI6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UUVqIqawEeqJcvXkREZ1XQ" x="638" y="594"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UUVqIqawEeqJcvXkREZ1XQ" x="638" y="594"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UVv_YKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UVv_YaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UVv_Y6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UVv_YKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UVv_YaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UVv_Y6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UVv_YqawEeqJcvXkREZ1XQ" x="1082" y="343"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVv_YqawEeqJcvXkREZ1XQ" x="1082" y="343"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UW7EEKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UW7EEaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UW7EE6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UW7EEKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UW7EEaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UW7EE6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UW7EEqawEeqJcvXkREZ1XQ" x="1082" y="243"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UW7EEqawEeqJcvXkREZ1XQ" x="1082" y="243"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UXEOAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UXE1EKawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXE1EqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UXEOAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UXE1EKawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UXE1EqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UXE1EaawEeqJcvXkREZ1XQ" x="1082" y="243"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UXE1EaawEeqJcvXkREZ1XQ" x="1082" y="243"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UXtHMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UXtHMaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXtHM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UXtHMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UXtHMaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UXtHM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UXtHMqawEeqJcvXkREZ1XQ" x="720" y="-18"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UXtHMqawEeqJcvXkREZ1XQ" x="720" y="-18"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UYi0sKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UYi0saawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYi0s6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UYi0sKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UYi0saawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UYi0s6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UYi0sqawEeqJcvXkREZ1XQ" x="720" y="-118"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UYi0sqawEeqJcvXkREZ1XQ" x="720" y="-118"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UYslsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UYslsaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYsls6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UYslsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UYslsaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UYsls6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UYslsqawEeqJcvXkREZ1XQ" x="720" y="-118"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UYslsqawEeqJcvXkREZ1XQ" x="720" y="-118"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UZOxMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UZOxMaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UZOxM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UZOxMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UZOxMaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UZOxM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UZOxMqawEeqJcvXkREZ1XQ" x="882" y="-262"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UZOxMqawEeqJcvXkREZ1XQ" x="882" y="-262"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UaBbYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UaBbYaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaCCcKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UaBbYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaBbYaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UaCCcKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UaBbYqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaBbYqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UaLMYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UaLMYaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaLMY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UaLMYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaLMYaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UaLMY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UaLMYqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaLMYqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UaVkcKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UaVkcaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaVkc6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_UaVkcKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaVkcaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UaVkc6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UaVkcqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaVkcqawEeqJcvXkREZ1XQ" x="882" y="-362"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Ua8BYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Ua8BYaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ua8BY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_Ua8BYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ua8BYaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ua8BY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ua8BYqawEeqJcvXkREZ1XQ" x="1571" y="-262"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ua8BYqawEeqJcvXkREZ1XQ" x="1571" y="-262"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UbpMAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UbpMAaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UbpMA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UbpMAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UbpMAaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UbpMA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UbpMAqawEeqJcvXkREZ1XQ" x="1324" y="-100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UbpMAqawEeqJcvXkREZ1XQ" x="1324" y="-100"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Ub98IKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Ub98IaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ub98I6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Ub98IKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ub98IaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ub98I6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ub98IqawEeqJcvXkREZ1XQ" x="1324" y="-200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ub98IqawEeqJcvXkREZ1XQ" x="1324" y="-200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UcWWoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UcWWoaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcWWo6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UcWWoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UcWWoaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UcWWo6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UcWWoqawEeqJcvXkREZ1XQ" x="1255" y="617"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UcWWoqawEeqJcvXkREZ1XQ" x="1255" y="617"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UcuKEKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_UcuKEaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcuKE6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
+    <children xmi:type="notation:Shape" xmi:id="_UcuKEKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UcuKEaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UcuKE6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UcuKEqawEeqJcvXkREZ1XQ" x="1255" y="517"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UcuKEqawEeqJcvXkREZ1XQ" x="1255" y="517"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Uc6-YKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Uc6-YaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Uc6-Y6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Uc6-YKawEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Uc6-YaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Uc6-Y6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Uc6-YqawEeqJcvXkREZ1XQ" x="245" y="-300"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uc6-YqawEeqJcvXkREZ1XQ" x="245" y="-300"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_UDyhIUS5Eem_eeeaz1ENMQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_UDyhIkS5Eem_eeeaz1ENMQ"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_UDyhI0S5Eem_eeeaz1ENMQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_UDyhIUS5Eem_eeeaz1ENMQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_UDyhIkS5Eem_eeeaz1ENMQ"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_UDyhI0S5Eem_eeeaz1ENMQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
     </styles>
-    <element href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_YvsPkES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_8PgDEE2sEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPkUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPkkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPk0S5Eem_eeeaz1ENMQ" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPlES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPlUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPlkS5Eem_eeeaz1ENMQ" x="-64" y="-40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPl0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPmES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPmUS5Eem_eeeaz1ENMQ" x="39" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPmkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPm0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPnES5Eem_eeeaz1ENMQ" x="-39" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPnUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPnkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPn0S5Eem_eeeaz1ENMQ" x="31" y="27"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvsPoES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvsPoUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvsPokS5Eem_eeeaz1ENMQ" x="-16" y="7"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_YvsPo0S5Eem_eeeaz1ENMQ"/>
-      <element href="TapiEquipment.uml#_Aw5ZcDlbEemDl_QGWIY6yg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvsPpES5Eem_eeeaz1ENMQ" points="[1044, 644, -643984, -643984]$[1366, 644, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvsPpUS5Eem_eeeaz1ENMQ" id="(1.0,0.3945578231292517)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvsPpkS5Eem_eeeaz1ENMQ" id="(0.0,0.5737704918032787)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Yvs2o0S5Eem_eeeaz1ENMQ" type="Association_Edge" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_Yvy9QES5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2pES5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2pUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2pkS5Eem_eeeaz1ENMQ" x="14" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2p0S5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2qES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2qUS5Eem_eeeaz1ENMQ" x="-8" y="10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2qkS5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2q0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2rES5Eem_eeeaz1ENMQ" x="19" y="-46"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2rUS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2rkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2r0S5Eem_eeeaz1ENMQ" x="-16" y="65"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2sES5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2sUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2skS5Eem_eeeaz1ENMQ" x="13" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvs2s0S5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvs2tES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvs2tUS5Eem_eeeaz1ENMQ" x="-18" y="-12"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Yvs2tkS5Eem_eeeaz1ENMQ"/>
-      <element href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Yvs2ukS5Eem_eeeaz1ENMQ" points="[309, 374, -643984, -643984]$[309, 577, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Yvs2u0S5Eem_eeeaz1ENMQ" id="(0.20149253731343283,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Yvs2vES5Eem_eeeaz1ENMQ" id="(0.2910602910602911,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YvtdsES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdsUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdskS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvtds0S5Eem_eeeaz1ENMQ" x="-28" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdtES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdtUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtdtkS5Eem_eeeaz1ENMQ" x="-48" y="-34"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvtdt0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtduES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtduUS5Eem_eeeaz1ENMQ" x="2" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdukS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvtdu0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtdvES5Eem_eeeaz1ENMQ" x="-2" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdvUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdvkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvtdv0S5Eem_eeeaz1ENMQ" x="29" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvtdwES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvtdwUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvtdwkS5Eem_eeeaz1ENMQ" x="-26" y="20"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Yvtdw0S5Eem_eeeaz1ENMQ"/>
-      <element href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Yvtdx0S5Eem_eeeaz1ENMQ" points="[980, 167, -643984, -643984]$[980, 180, -643984, -643984]$[740, 180, -643984, -643984]$[740, 594, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvtdyES5Eem_eeeaz1ENMQ" id="(0.36803874092009686,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvtdyUS5Eem_eeeaz1ENMQ" id="(0.7926509186351706,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YvteBES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvteBUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteB0S5Eem_eeeaz1ENMQ" x="-12" y="-9"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvteCES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteCkS5Eem_eeeaz1ENMQ" x="9" y="-3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvteC0S5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
-        <eAnnotations xmi:id="_YvteDES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
-          <details xmi:id="_YvteDUS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
+    <element xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YvsPkES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_8PgDEE2sEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPkUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPkkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPk0S5Eem_eeeaz1ENMQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPlES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPlUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPlkS5Eem_eeeaz1ENMQ" x="-64" y="-40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPl0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPmES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPmUS5Eem_eeeaz1ENMQ" x="39" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPmkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPm0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPnES5Eem_eeeaz1ENMQ" x="-39" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPnUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPnkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPn0S5Eem_eeeaz1ENMQ" x="31" y="27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvsPoES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvsPoUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvsPokS5Eem_eeeaz1ENMQ" x="-16" y="7"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YvsPo0S5Eem_eeeaz1ENMQ"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_Aw5ZcDlbEemDl_QGWIY6yg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvsPpES5Eem_eeeaz1ENMQ" points="[1044, 644, -643984, -643984]$[1366, 644, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvsPpUS5Eem_eeeaz1ENMQ" id="(1.0,0.3945578231292517)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvsPpkS5Eem_eeeaz1ENMQ" id="(0.0,0.5737704918032787)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Yvs2o0S5Eem_eeeaz1ENMQ" type="Association_Edge" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_Yvy9QES5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2pES5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2pUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2pkS5Eem_eeeaz1ENMQ" x="14" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2p0S5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2qES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2qUS5Eem_eeeaz1ENMQ" x="-8" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2qkS5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2q0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2rES5Eem_eeeaz1ENMQ" x="19" y="-46"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2rUS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2rkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2r0S5Eem_eeeaz1ENMQ" x="-16" y="65"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2sES5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2sUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2skS5Eem_eeeaz1ENMQ" x="13" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvs2s0S5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvs2tES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvs2tUS5Eem_eeeaz1ENMQ" x="-18" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Yvs2tkS5Eem_eeeaz1ENMQ"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yvs2ukS5Eem_eeeaz1ENMQ" points="[309, 374, -643984, -643984]$[309, 577, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yvs2u0S5Eem_eeeaz1ENMQ" id="(0.20149253731343283,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yvs2vES5Eem_eeeaz1ENMQ" id="(0.2910602910602911,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YvtdsES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdsUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdskS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvtds0S5Eem_eeeaz1ENMQ" x="-28" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdtES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdtUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtdtkS5Eem_eeeaz1ENMQ" x="-48" y="-34"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvtdt0S5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtduES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtduUS5Eem_eeeaz1ENMQ" x="2" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdukS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvtdu0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtdvES5Eem_eeeaz1ENMQ" x="-2" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdvUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdvkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvtdv0S5Eem_eeeaz1ENMQ" x="29" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvtdwES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvtdwUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvtdwkS5Eem_eeeaz1ENMQ" x="-26" y="20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Yvtdw0S5Eem_eeeaz1ENMQ"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yvtdx0S5Eem_eeeaz1ENMQ" points="[980, 167, -643984, -643984]$[980, 180, -643984, -643984]$[740, 180, -643984, -643984]$[740, 594, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvtdyES5Eem_eeeaz1ENMQ" id="(0.36803874092009686,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvtdyUS5Eem_eeeaz1ENMQ" id="(0.7926509186351706,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YvteBES5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvteBUS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteB0S5Eem_eeeaz1ENMQ" x="-12" y="-9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvteCES5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteCkS5Eem_eeeaz1ENMQ" x="9" y="-3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvteC0S5Eem_eeeaz1ENMQ" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YvteDES5Eem_eeeaz1ENMQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YvteDUS5Eem_eeeaz1ENMQ" key="visible" value="true"/>
         </eAnnotations>
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteDkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteD0S5Eem_eeeaz1ENMQ" x="73" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvteEES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteEUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteEkS5Eem_eeeaz1ENMQ" x="-53" y="15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvteE0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteFES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteFUS5Eem_eeeaz1ENMQ" x="15" y="14"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvteFkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvteF0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvteGES5Eem_eeeaz1ENMQ" x="-26" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_YvteGUS5Eem_eeeaz1ENMQ"/>
-      <element href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvteHUS5Eem_eeeaz1ENMQ" points="[543, 577, -643984, -643984]$[543, 374, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvteHkS5Eem_eeeaz1ENMQ" id="(0.7900207900207901,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvteH0S5Eem_eeeaz1ENMQ" id="(0.7985074626865671,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Yvv6dUS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6dkS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvv6d0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvv6eES5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6eUS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yvv6ekS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Yvv6e0S5Eem_eeeaz1ENMQ" x="2" y="17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Yvv6fES5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhAES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhAUS5Eem_eeeaz1ENMQ" x="23" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhAkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhA0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhBES5Eem_eeeaz1ENMQ" x="-23" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhBUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhB0S5Eem_eeeaz1ENMQ" x="24" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvwhCES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvwhCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvwhCkS5Eem_eeeaz1ENMQ" x="-24" y="-18"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_YvwhC0S5Eem_eeeaz1ENMQ"/>
-      <element href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvwhDES5Eem_eeeaz1ENMQ" points="[1603, 339, -643984, -643984]$[1603, 409, -643984, -643984]$[1525, 409, -643984, -643984]$[1525, 479, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvwhDUS5Eem_eeeaz1ENMQ" id="(0.425531914893617,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvwhDkS5Eem_eeeaz1ENMQ" id="(0.425531914893617,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YvxvOkS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_4jT6oE2rEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvO0S5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvPES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvPUS5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvPkS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvP0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvQES5Eem_eeeaz1ENMQ" x="-8" y="70"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvQUS5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvQkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvQ0S5Eem_eeeaz1ENMQ" x="6" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvRES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvRUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvRkS5Eem_eeeaz1ENMQ" x="-6" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvR0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvSES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvSUS5Eem_eeeaz1ENMQ" x="24" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YvxvSkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YvxvS0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YvxvTES5Eem_eeeaz1ENMQ" x="-8" y="-17"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_YvxvTUS5Eem_eeeaz1ENMQ"/>
-      <element href="TapiEquipment.uml#_6B5aoC7BEemaZq0-6SfFXw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YvxvTkS5Eem_eeeaz1ENMQ" points="[1143, 102, -643984, -643984]$[1215, 102, -643984, -643984]$[1215, 9, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvxvT0S5Eem_eeeaz1ENMQ" id="(1.0,0.47244094488188976)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YvxvUES5Eem_eeeaz1ENMQ" id="(0.4473684210526316,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_QbC-0ElZEemT5f_Ewhfs6A" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_QbC-00lZEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ViYFAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbC-1ElZEemT5f_Ewhfs6A" x="36"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_QbC-1UlZEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WMqYIElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbC-1klZEemT5f_Ewhfs6A" x="16" y="8"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_QbC-10lZEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WztKAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl4ElZEemT5f_Ewhfs6A" x="21" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_QbDl4UlZEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XcyjQElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl4klZEemT5f_Ewhfs6A" x="-21" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_QbDl40lZEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YEElsElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl5ElZEemT5f_Ewhfs6A" x="21" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_QbDl5UlZEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YthyYElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_QbDl5klZEemT5f_Ewhfs6A" x="-22" y="-17"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_QbC-0UlZEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_QbC-0klZEemT5f_Ewhfs6A" points="[1247, 130, -643984, -643984]$[1247, 349, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RwuYUElZEemT5f_Ewhfs6A" id="(0.4648910411622276,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_RwuYUUlZEemT5f_Ewhfs6A" id="(0.3491271820448878,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_MMsq4ElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_MMsq40lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xz2pUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMsq5ElgEemT5f_Ewhfs6A" x="-14" y="-8"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_MMsq5UlgEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Yc0GwEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMsq5klgEemT5f_Ewhfs6A" x="10" y="-6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR8ElgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ZEHXUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR8UlgEemT5f_Ewhfs6A" x="15" y="-82"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR8klgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Zuz6IEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR80lgEemT5f_Ewhfs6A" x="-17" y="-40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR9ElgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_aYUxMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR9UlgEemT5f_Ewhfs6A" x="15" y="-14"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_MMtR9klgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bALbYEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MMtR90lgEemT5f_Ewhfs6A" x="-20" y="-15"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_MMsq4UlgEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MMsq4klgEemT5f_Ewhfs6A" points="[882, 458, -643984, -643984]$[822, 458, -643984, -643984]$[822, 398, -643984, -643984]$[882, 398, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NkQ6wElgEemT5f_Ewhfs6A" id="(0.0,0.8455882352941176)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NkQ6wUlgEemT5f_Ewhfs6A" id="(0.0,0.40441176470588236)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_V8cGoElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_V8cGo0lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MC6x4EliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctsElgEemT5f_Ewhfs6A" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_V8ctsUlgEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Mzf6QEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctsklgEemT5f_Ewhfs6A" x="1" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_V8cts0lgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NhHOMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8cttElgEemT5f_Ewhfs6A" x="68" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_V8cttUlgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OIzgUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8cttklgEemT5f_Ewhfs6A" x="-68" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_V8ctt0lgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OwMQcEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctuElgEemT5f_Ewhfs6A" x="14" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_V8ctuUlgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_PYowgEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_V8ctuklgEemT5f_Ewhfs6A" x="-15" y="25"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_V8cGoUlgEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_V8cGoklgEemT5f_Ewhfs6A" points="[1387, 469, -643984, -643984]$[1387, 529, -643984, -643984]$[1187, 529, -643984, -643984]$[1187, 469, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XQGG4ElgEemT5f_Ewhfs6A" id="(0.6982543640897756,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XQGG4UlgEemT5f_Ewhfs6A" id="(0.19950124688279303,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_TTeRkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_c6RzwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRlEvXEemT5f_Ewhfs6A" x="-65" y="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_dYzi0EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRlkvXEemT5f_Ewhfs6A" x="-60" y="11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRl0vXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_d3_ZMEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRmEvXEemT5f_Ewhfs6A" x="72" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRmUvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_eXA3gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRmkvXEemT5f_Ewhfs6A" x="-32" y="60"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRm0vXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_e1NPYEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRnEvXEemT5f_Ewhfs6A" x="15" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TTeRnUvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fTML4EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TTeRnkvXEemT5f_Ewhfs6A" x="-13" y="16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_TTeRkUvXEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TTeRkkvXEemT5f_Ewhfs6A" points="[744, 46, -643984, -643984]$[519, 46, -643984, -643984]$[519, 182, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URfZAEvXEemT5f_Ewhfs6A" id="(0.0,0.49056603773584906)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URfZAUvXEemT5f_Ewhfs6A" id="(0.7487562189054726,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_WUpjkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_WUpjk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_pu5VwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUpjlEvXEemT5f_Ewhfs6A" x="-24"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WUpjlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_qOc_kEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUpjlkvXEemT5f_Ewhfs6A" x="-44" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKoEvXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_qscjIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKoUvXEemT5f_Ewhfs6A" x="75" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKokvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_rKWnIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKo0vXEemT5f_Ewhfs6A" x="-75" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKpEvXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_rpMfQEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKpUvXEemT5f_Ewhfs6A" x="75" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WUqKpkvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_sHI_gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WUqKp0vXEemT5f_Ewhfs6A" x="-13" y="16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_WUpjkUvXEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_WUpjkkvXEemT5f_Ewhfs6A" points="[827, 81, -643984, -643984]$[827, 585, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XWKD4EvXEemT5f_Ewhfs6A" id="(0.2846975088967972,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XWKD4UvXEemT5f_Ewhfs6A" id="(0.4304461942257218,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_I4JjYEvxEemT5f_Ewhfs6A" type="Abstraction_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_7M57YEvwEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_I4JjY0vxEemT5f_Ewhfs6A" type="Abstraction_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ZnfZEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_I4JjZEvxEemT5f_Ewhfs6A" x="-9" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_I4JjZUvxEemT5f_Ewhfs6A" type="Abstraction_StereotypeLabel">
-        <eAnnotations xmi:id="_ZWNRQEvxEemT5f_Ewhfs6A" source="QualifiedName">
-          <details xmi:id="_ZWNRQUvxEemT5f_Ewhfs6A" key="QualifiedNameDepth" value="2"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteDkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteD0S5Eem_eeeaz1ENMQ" x="73" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvteEES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteEUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteEkS5Eem_eeeaz1ENMQ" x="-53" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvteE0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteFES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteFUS5Eem_eeeaz1ENMQ" x="15" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvteFkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvteF0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvteGES5Eem_eeeaz1ENMQ" x="-26" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YvteGUS5Eem_eeeaz1ENMQ"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvteHUS5Eem_eeeaz1ENMQ" points="[543, 577, -643984, -643984]$[543, 374, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvteHkS5Eem_eeeaz1ENMQ" id="(0.7900207900207901,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvteH0S5Eem_eeeaz1ENMQ" id="(0.7985074626865671,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Yvv6dUS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6dkS5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvv6d0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvv6eES5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6eUS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yvv6ekS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yvv6e0S5Eem_eeeaz1ENMQ" x="2" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yvv6fES5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhAES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhAUS5Eem_eeeaz1ENMQ" x="23" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhAkS5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhA0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhBES5Eem_eeeaz1ENMQ" x="-23" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhBUS5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhBkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhB0S5Eem_eeeaz1ENMQ" x="24" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvwhCES5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvwhCUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvwhCkS5Eem_eeeaz1ENMQ" x="-24" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YvwhC0S5Eem_eeeaz1ENMQ"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvwhDES5Eem_eeeaz1ENMQ" points="[1603, 339, -643984, -643984]$[1603, 409, -643984, -643984]$[1525, 409, -643984, -643984]$[1525, 479, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvwhDUS5Eem_eeeaz1ENMQ" id="(0.425531914893617,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvwhDkS5Eem_eeeaz1ENMQ" id="(0.425531914893617,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YvxvOkS5Eem_eeeaz1ENMQ" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_4jT6oE2rEemQQPVBE79CWA" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvO0S5Eem_eeeaz1ENMQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvPES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvPUS5Eem_eeeaz1ENMQ" x="-1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvPkS5Eem_eeeaz1ENMQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvP0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvQES5Eem_eeeaz1ENMQ" x="-8" y="70"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvQUS5Eem_eeeaz1ENMQ" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvQkS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvQ0S5Eem_eeeaz1ENMQ" x="6" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvRES5Eem_eeeaz1ENMQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvRUS5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvRkS5Eem_eeeaz1ENMQ" x="-6" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvR0S5Eem_eeeaz1ENMQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvSES5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvSUS5Eem_eeeaz1ENMQ" x="24" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YvxvSkS5Eem_eeeaz1ENMQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YvxvS0S5Eem_eeeaz1ENMQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YvxvTES5Eem_eeeaz1ENMQ" x="-8" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YvxvTUS5Eem_eeeaz1ENMQ"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_6B5aoC7BEemaZq0-6SfFXw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvxvTkS5Eem_eeeaz1ENMQ" points="[1143, 102, -643984, -643984]$[1215, 102, -643984, -643984]$[1215, 9, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvxvT0S5Eem_eeeaz1ENMQ" id="(1.0,0.47244094488188976)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YvxvUES5Eem_eeeaz1ENMQ" id="(0.4473684210526316,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_QbC-0ElZEemT5f_Ewhfs6A" type="Association_Edge" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QbC-00lZEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ViYFAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbC-1ElZEemT5f_Ewhfs6A" x="36"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QbC-1UlZEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WMqYIElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbC-1klZEemT5f_Ewhfs6A" x="16" y="8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QbC-10lZEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WztKAElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl4ElZEemT5f_Ewhfs6A" x="21" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QbDl4UlZEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XcyjQElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl4klZEemT5f_Ewhfs6A" x="-21" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QbDl40lZEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YEElsElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl5ElZEemT5f_Ewhfs6A" x="21" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QbDl5UlZEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YthyYElZEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QbDl5klZEemT5f_Ewhfs6A" x="-22" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_QbC-0UlZEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QbC-0klZEemT5f_Ewhfs6A" points="[1247, 130, -643984, -643984]$[1247, 349, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RwuYUElZEemT5f_Ewhfs6A" id="(0.4648910411622276,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RwuYUUlZEemT5f_Ewhfs6A" id="(0.3491271820448878,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MMsq4ElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMsq40lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xz2pUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMsq5ElgEemT5f_Ewhfs6A" x="-14" y="-8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMsq5UlgEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yc0GwEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMsq5klgEemT5f_Ewhfs6A" x="10" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR8ElgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZEHXUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR8UlgEemT5f_Ewhfs6A" x="15" y="-82"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR8klgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Zuz6IEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR80lgEemT5f_Ewhfs6A" x="-17" y="-40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR9ElgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aYUxMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR9UlgEemT5f_Ewhfs6A" x="15" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMtR9klgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bALbYEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MMtR90lgEemT5f_Ewhfs6A" x="-20" y="-15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_MMsq4UlgEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MMsq4klgEemT5f_Ewhfs6A" points="[882, 458, -643984, -643984]$[822, 458, -643984, -643984]$[822, 398, -643984, -643984]$[882, 398, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NkQ6wElgEemT5f_Ewhfs6A" id="(0.0,0.8455882352941176)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NkQ6wUlgEemT5f_Ewhfs6A" id="(0.0,0.40441176470588236)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_V8cGoElgEemT5f_Ewhfs6A" type="Association_Edge" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_ESGL0ElgEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_V8cGo0lgEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MC6x4EliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctsElgEemT5f_Ewhfs6A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V8ctsUlgEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Mzf6QEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctsklgEemT5f_Ewhfs6A" x="1" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V8cts0lgEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NhHOMEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8cttElgEemT5f_Ewhfs6A" x="68" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V8cttUlgEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OIzgUEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8cttklgEemT5f_Ewhfs6A" x="-68" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V8ctt0lgEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OwMQcEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctuElgEemT5f_Ewhfs6A" x="14" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V8ctuUlgEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PYowgEliEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V8ctuklgEemT5f_Ewhfs6A" x="-15" y="25"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_V8cGoUlgEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V8cGoklgEemT5f_Ewhfs6A" points="[1387, 469, -643984, -643984]$[1387, 529, -643984, -643984]$[1187, 529, -643984, -643984]$[1187, 469, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XQGG4ElgEemT5f_Ewhfs6A" id="(0.6982543640897756,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XQGG4UlgEemT5f_Ewhfs6A" id="(0.19950124688279303,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_TTeRkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_YvvTPUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c6RzwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRlEvXEemT5f_Ewhfs6A" x="-65" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dYzi0EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRlkvXEemT5f_Ewhfs6A" x="-60" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRl0vXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_d3_ZMEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRmEvXEemT5f_Ewhfs6A" x="72" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRmUvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_eXA3gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRmkvXEemT5f_Ewhfs6A" x="-32" y="60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRm0vXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_e1NPYEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRnEvXEemT5f_Ewhfs6A" x="15" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TTeRnUvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fTML4EvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TTeRnkvXEemT5f_Ewhfs6A" x="-13" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_TTeRkUvXEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TTeRkkvXEemT5f_Ewhfs6A" points="[744, 46, -643984, -643984]$[519, 46, -643984, -643984]$[519, 182, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_URfZAEvXEemT5f_Ewhfs6A" id="(0.0,0.49056603773584906)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_URfZAUvXEemT5f_Ewhfs6A" id="(0.7487562189054726,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_WUpjkEvXEemT5f_Ewhfs6A" type="Association_Edge" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_Yvy9qES5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUpjk0vXEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pu5VwEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUpjlEvXEemT5f_Ewhfs6A" x="-24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUpjlUvXEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qOc_kEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUpjlkvXEemT5f_Ewhfs6A" x="-44" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKoEvXEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qscjIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKoUvXEemT5f_Ewhfs6A" x="75" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKokvXEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_rKWnIEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKo0vXEemT5f_Ewhfs6A" x="-75" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKpEvXEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_rpMfQEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKpUvXEemT5f_Ewhfs6A" x="75" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUqKpkvXEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sHI_gEvXEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUqKp0vXEemT5f_Ewhfs6A" x="-13" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WUpjkUvXEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WUpjkkvXEemT5f_Ewhfs6A" points="[827, 81, -643984, -643984]$[827, 585, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWKD4EvXEemT5f_Ewhfs6A" id="(0.2846975088967972,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWKD4UvXEemT5f_Ewhfs6A" id="(0.4304461942257218,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_I4JjYEvxEemT5f_Ewhfs6A" type="Abstraction_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_7M57YEvwEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_I4JjY0vxEemT5f_Ewhfs6A" type="Abstraction_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZnfZEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_I4JjZEvxEemT5f_Ewhfs6A" x="-9" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_I4JjZUvxEemT5f_Ewhfs6A" type="Abstraction_StereotypeLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZWNRQEvxEemT5f_Ewhfs6A" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZWNRQUvxEemT5f_Ewhfs6A" key="QualifiedNameDepth" value="2"/>
         </eAnnotations>
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_aCqSIEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_I4JjZkvxEemT5f_Ewhfs6A" x="-12" y="7"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_I4JjYUvxEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_I4JjYkvxEemT5f_Ewhfs6A" points="[1186, -231, -643984, -643984]$[1407, -231, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JsCecEvxEemT5f_Ewhfs6A" id="(1.0,0.35398230088495575)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JsCecUvxEemT5f_Ewhfs6A" id="(0.0,0.4)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__DqVEEvxEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_dOMqwEvWEemT5f_Ewhfs6A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__DqVE0vxEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MjcT8EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVFEvxEemT5f_Ewhfs6A" x="-1" y="2"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__DqVFUvxEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_M-LvMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVFkvxEemT5f_Ewhfs6A" x="-18" y="4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__DqVF0vxEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NZUMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVGEvxEemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__DqVGUvxEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_N0vjwEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__DqVGkvxEemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__Dq8IEvxEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OSDx4EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__Dq8IUvxEemT5f_Ewhfs6A" x="8" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__Dq8IkvxEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OsgSMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__Dq8I0vxEemT5f_Ewhfs6A" x="-16" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__DqVEUvxEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__DqVEkvxEemT5f_Ewhfs6A" points="[936, -159, -643984, -643984]$[936, -27, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__6M7gEvxEemT5f_Ewhfs6A" id="(0.09302325581395349,0.9911504424778761)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__6M7gUvxEemT5f_Ewhfs6A" id="(0.6405693950177936,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_DpB9sEvyEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_Yvv6IUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9s0vyEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_adqMEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9tEvyEemT5f_Ewhfs6A" x="-4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9tUvyEemT5f_Ewhfs6A" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a6aZgEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9tkvyEemT5f_Ewhfs6A" x="-24" y="-8"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9t0vyEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bWB-gEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9uEvyEemT5f_Ewhfs6A" x="36" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9uUvyEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bxS-MEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9ukvyEemT5f_Ewhfs6A" x="-36" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9u0vyEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cMlMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9vEvyEemT5f_Ewhfs6A" x="24" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DpB9vUvyEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cn5PAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DpB9vkvyEemT5f_Ewhfs6A" x="-13" y="-31"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_DpB9sUvyEemT5f_Ewhfs6A"/>
-      <element href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DpB9skvyEemT5f_Ewhfs6A" points="[1155, -159, -643984, -643984]$[1155, 49, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EgApAEvyEemT5f_Ewhfs6A" id="(0.8239202657807309,0.9911504424778761)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EgApAUvyEemT5f_Ewhfs6A" id="(0.2711864406779661,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_MccoQE2sEemQQPVBE79CWA" type="Abstraction_Edge" source="_4jT6oE2rEemQQPVBE79CWA" target="_Yvur1US5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_MccoQ02sEemQQPVBE79CWA" type="Abstraction_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_QmiqIE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_MccoRE2sEemQQPVBE79CWA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_McdPUE2sEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Q55rAE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_McdPUU2sEemQQPVBE79CWA" x="-21" y="-13"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_MccoQU2sEemQQPVBE79CWA"/>
-      <element href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MccoQk2sEemQQPVBE79CWA" points="[1360, 9, -643984, -643984]$[1360, 100, -643984, -643984]$[1371, 100, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDINwE2sEemQQPVBE79CWA" id="(0.7763157894736842,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDINwU2sEemQQPVBE79CWA" id="(0.0,0.42)"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aCqSIEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_I4JjZkvxEemT5f_Ewhfs6A" x="-12" y="7"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_I4JjYUvxEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I4JjYkvxEemT5f_Ewhfs6A" points="[1186, -231, -643984, -643984]$[1407, -231, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JsCecEvxEemT5f_Ewhfs6A" id="(1.0,0.35398230088495575)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JsCecUvxEemT5f_Ewhfs6A" id="(0.0,0.4)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__DqVEEvxEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_dOMqwEvWEemT5f_Ewhfs6A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__DqVE0vxEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MjcT8EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVFEvxEemT5f_Ewhfs6A" x="-1" y="2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__DqVFUvxEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_M-LvMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVFkvxEemT5f_Ewhfs6A" x="-18" y="4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__DqVF0vxEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NZUMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVGEvxEemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__DqVGUvxEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_N0vjwEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__DqVGkvxEemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__Dq8IEvxEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OSDx4EvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__Dq8IUvxEemT5f_Ewhfs6A" x="8" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__Dq8IkvxEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OsgSMEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__Dq8I0vxEemT5f_Ewhfs6A" x="-16" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__DqVEUvxEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__DqVEkvxEemT5f_Ewhfs6A" points="[936, -159, -643984, -643984]$[936, -27, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__6M7gEvxEemT5f_Ewhfs6A" id="(0.09302325581395349,0.9911504424778761)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__6M7gUvxEemT5f_Ewhfs6A" id="(0.6405693950177936,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DpB9sEvyEemT5f_Ewhfs6A" type="Association_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_Yvv6IUS5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9s0vyEemT5f_Ewhfs6A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_adqMEEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9tEvyEemT5f_Ewhfs6A" x="-4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9tUvyEemT5f_Ewhfs6A" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a6aZgEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9tkvyEemT5f_Ewhfs6A" x="-24" y="-8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9t0vyEemT5f_Ewhfs6A" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bWB-gEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9uEvyEemT5f_Ewhfs6A" x="36" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9uUvyEemT5f_Ewhfs6A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bxS-MEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9ukvyEemT5f_Ewhfs6A" x="-36" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9u0vyEemT5f_Ewhfs6A" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cMlMAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9vEvyEemT5f_Ewhfs6A" x="24" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DpB9vUvyEemT5f_Ewhfs6A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cn5PAEvyEemT5f_Ewhfs6A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DpB9vkvyEemT5f_Ewhfs6A" x="-13" y="-31"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DpB9sUvyEemT5f_Ewhfs6A"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DpB9skvyEemT5f_Ewhfs6A" points="[1155, -159, -643984, -643984]$[1155, 49, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgApAEvyEemT5f_Ewhfs6A" id="(0.8239202657807309,0.9911504424778761)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgApAUvyEemT5f_Ewhfs6A" id="(0.2711864406779661,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MccoQE2sEemQQPVBE79CWA" type="Abstraction_Edge" source="_4jT6oE2rEemQQPVBE79CWA" target="_Yvur1US5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MccoQ02sEemQQPVBE79CWA" type="Abstraction_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QmiqIE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MccoRE2sEemQQPVBE79CWA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_McdPUE2sEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Q55rAE2sEemQQPVBE79CWA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_McdPUU2sEemQQPVBE79CWA" x="-21" y="-13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_MccoQU2sEemQQPVBE79CWA"/>
+      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MccoQk2sEemQQPVBE79CWA" points="[1360, 9, -643984, -643984]$[1360, 100, -643984, -643984]$[1371, 100, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDINwE2sEemQQPVBE79CWA" id="(0.7763157894736842,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDINwU2sEemQQPVBE79CWA" id="(0.0,0.42)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Tt3yAE2tEemQQPVBE79CWA" type="Abstraction_Edge" source="_8PgDEE2sEemQQPVBE79CWA" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Tt3yA02tEemQQPVBE79CWA" type="Abstraction_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_qgo-EHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Tt3yBE2tEemQQPVBE79CWA" y="40"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Tt3yAE2tEemQQPVBE79CWA" type="Abstraction_Edge" source="_8PgDEE2sEemQQPVBE79CWA" target="_Yvs210S5Eem_eeeaz1ENMQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tt3yA02tEemQQPVBE79CWA" type="Abstraction_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qgo-EHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tt3yBE2tEemQQPVBE79CWA" y="40"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Tt4ZEE2tEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_q04IsHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Tt4ZEU2tEemQQPVBE79CWA" x="-60" y="-48"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tt4ZEE2tEemQQPVBE79CWA" type="Abstraction_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_q04IsHsyEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tt4ZEU2tEemQQPVBE79CWA" x="-60" y="-48"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Tt3yAU2tEemQQPVBE79CWA"/>
-      <element href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Tt3yAk2tEemQQPVBE79CWA" points="[1444, 633, -643984, -643984]$[1596, 633, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVCfsE2tEemQQPVBE79CWA" id="(1.0,0.4262295081967213)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVCfsU2tEemQQPVBE79CWA" id="(0.0,0.45)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Tt3yAU2tEemQQPVBE79CWA"/>
+      <element xmi:type="uml:Abstraction" href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tt3yAk2tEemQQPVBE79CWA" points="[1444, 633, -643984, -643984]$[1596, 633, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UVCfsE2tEemQQPVBE79CWA" id="(1.0,0.4262295081967213)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UVCfsU2tEemQQPVBE79CWA" id="(0.0,0.45)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ha4swHstEemfSIWqmJMEQA" type="InterfaceRealization_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_EM33QHspEemfSIWqmJMEQA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ha4sw3stEemfSIWqmJMEQA" type="InterfaceRealization_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_uOT78HstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ha4sxHstEemfSIWqmJMEQA" x="-1" y="38"/>
+    <edges xmi:type="notation:Connector" xmi:id="_ha4swHstEemfSIWqmJMEQA" type="InterfaceRealization_Edge" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_EM33QHspEemfSIWqmJMEQA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ha4sw3stEemfSIWqmJMEQA" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uOT78HstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ha4sxHstEemfSIWqmJMEQA" x="-1" y="38"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ha4sxXstEemfSIWqmJMEQA" type="InterfaceRealization_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_uh9QsHstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ha4sxnstEemfSIWqmJMEQA" x="-1" y="58"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ha4sxXstEemfSIWqmJMEQA" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uh9QsHstEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ha4sxnstEemfSIWqmJMEQA" x="-1" y="58"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_ha4swXstEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_g_g_YHstEemfSIWqmJMEQA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ha4swnstEemfSIWqmJMEQA" points="[907, -254, -643984, -643984]$[532, -217, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iJKIAHstEemfSIWqmJMEQA" id="(0.0,0.4247787610619469)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iJKIAXstEemfSIWqmJMEQA" id="(1.0,0.4419889502762431)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ha4swXstEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:InterfaceRealization" href="TapiEquipment.uml#_g_g_YHstEemfSIWqmJMEQA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ha4swnstEemfSIWqmJMEQA" points="[907, -254, -643984, -643984]$[532, -217, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJKIAHstEemfSIWqmJMEQA" id="(0.0,0.4247787610619469)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJKIAXstEemfSIWqmJMEQA" id="(1.0,0.4419889502762431)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UNnXEKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvs210S5Eem_eeeaz1ENMQ" target="_UNmwAKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UNnXEaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UNnXFaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UNnXEKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvs210S5Eem_eeeaz1ENMQ" target="_UNmwAKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UNnXEaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UNnXFaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UNnXEqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNnXE6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNnXFKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UNnXEqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UNnXE6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UNnXFKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UOLXwaawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_UOKwsKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UOLXwqawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UOLXxqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UOLXwaawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvur1US5Eem_eeeaz1ENMQ" target="_UOKwsKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UOLXwqawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UOLXxqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UOLXw6awEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UOLXxKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UOLXxaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UOLXw6awEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UOLXxKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UOLXxaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UO5whKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_UO5wgKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UO5whaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UO5wiaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UO5whKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvvTPUS5Eem_eeeaz1ENMQ" target="_UO5wgKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UO5whaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UO5wiaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UO5whqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UO5wh6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UO5wiKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UO5whqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UO5wh6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UO5wiKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UQK71KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvs2o0S5Eem_eeeaz1ENMQ" target="_UQK70KawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UQK71aawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQK72aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UQK71KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvs2o0S5Eem_eeeaz1ENMQ" target="_UQK70KawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UQK71aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQK72aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UQK71qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQK716awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQK72KawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQK71qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQK716awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQK72KawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UQ57pKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_UQ57oKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UQ57paawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UQ57qaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UQ57pKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvv6IUS5Eem_eeeaz1ENMQ" target="_UQ57oKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UQ57paawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQ57qaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_qCBY4FRMEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UQ57pqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQ57p6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UQ57qKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQ57pqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQ57p6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQ57qKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_URtz9KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvtdsES5Eem_eeeaz1ENMQ" target="_URtz8KawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_URtz9aawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_URubAqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_URtz9KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvtdsES5Eem_eeeaz1ENMQ" target="_URtz8KawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_URtz9aawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_URubAqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_xJVScFRPEeiyzdV8zVsJ_w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_URtz9qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URubAKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_URubAaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_URtz9qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_URubAKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_URubAaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UR6oRKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QbC-0ElZEemT5f_Ewhfs6A" target="_UR6oQKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UR6oRaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UR6oSaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UR6oRKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QbC-0ElZEemT5f_Ewhfs6A" target="_UR6oQKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UR6oRaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UR6oSaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_PsaXMElZEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UR6oRqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UR6oR6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UR6oSKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UR6oRqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UR6oR6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UR6oSKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UShFNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_UShFMKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UShFNaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UShsQqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UShFNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvy9QES5Eem_eeeaz1ENMQ" target="_UShFMKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UShFNaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UShsQqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UShFNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UShsQKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UShsQaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UShFNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UShsQKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UShsQaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UTjnBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvteBES5Eem_eeeaz1ENMQ" target="_UTjnAKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UTjnBaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UTjnCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UTjnBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YvteBES5Eem_eeeaz1ENMQ" target="_UTjnAKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UTjnBaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UTjnCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UTjnBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UTjnB6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UTjnCKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UTjnBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UTjnB6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UTjnCKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UUVqJKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_UUVqIKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UUVqJaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UUVqKaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UUVqJKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Yvy9qES5Eem_eeeaz1ENMQ" target="_UUVqIKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UUVqJaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UUVqKaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNpD-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UUVqJqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UUVqJ6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UUVqKKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UUVqJqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UUVqJ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UUVqKKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UVv_ZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_UVv_YKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UVv_ZaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UVv_aaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UVv_ZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ESGL0ElgEemT5f_Ewhfs6A" target="_UVv_YKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UVv_ZaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UVv_aaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_ESEWoElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UVv_ZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVv_Z6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UVv_aKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UVv_ZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UVv_Z6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UVv_aKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UW7EFKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MMsq4ElgEemT5f_Ewhfs6A" target="_UW7EEKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UW7EFaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UW7EGaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UW7EFKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MMsq4ElgEemT5f_Ewhfs6A" target="_UW7EEKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UW7EFaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UW7EGaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_LjmqkElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UW7EFqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UW7EF6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UW7EGKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UW7EFqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UW7EF6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UW7EGKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UXE1E6awEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_V8cGoElgEemT5f_Ewhfs6A" target="_UXEOAKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UXE1FKawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXE1GKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UXE1E6awEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_V8cGoElgEemT5f_Ewhfs6A" target="_UXEOAKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UXE1FKawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UXE1GKawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_VSjcIElgEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UXE1FaawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXE1FqawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXE1F6awEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UXE1FaawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UXE1FqawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UXE1F6awEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UXtHNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_UXtHMKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UXtHNaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UXtuQqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UXtHNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dOMqwEvWEemT5f_Ewhfs6A" target="_UXtHMKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UXtHNaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UXtuQqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_dOLcoEvWEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UXtHNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXtuQKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UXtuQaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UXtHNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UXtuQKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UXtuQaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UYi0tKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_TTeRkEvXEemT5f_Ewhfs6A" target="_UYi0sKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UYi0taawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYi0uaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UYi0tKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_TTeRkEvXEemT5f_Ewhfs6A" target="_UYi0sKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UYi0taawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UYi0uaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_S0vuMEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UYi0tqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYi0t6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYi0uKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UYi0tqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UYi0t6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UYi0uKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UYsltKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WUpjkEvXEemT5f_Ewhfs6A" target="_UYslsKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UYsltaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UYsluaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UYsltKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WUpjkEvXEemT5f_Ewhfs6A" target="_UYslsKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UYsltaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UYsluaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_V181YEvXEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UYsltqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYslt6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UYsluKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UYsltqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UYslt6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UYsluKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UZPYQKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_UZOxMKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UZPYQaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UZPYRaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UZPYQKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_gPB_sEvwEemT5f_Ewhfs6A" target="_UZOxMKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UZPYQaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UZPYRaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_gO_jcEvwEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UZPYQqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UZPYQ6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UZPYRKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UZPYQqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UZPYQ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UZPYRKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UaCCcaawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_I4JjYEvxEemT5f_Ewhfs6A" target="_UaBbYKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UaCCcqawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaCCdqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UaCCcaawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_I4JjYEvxEemT5f_Ewhfs6A" target="_UaBbYKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UaCCcqawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UaCCdqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_I4IVQEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UaCCc6awEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaCCdKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaCCdaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UaCCc6awEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaCCdKawEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaCCdaawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UaLMZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__DqVEEvxEemT5f_Ewhfs6A" target="_UaLMYKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UaLMZaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaLMaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UaLMZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__DqVEEvxEemT5f_Ewhfs6A" target="_UaLMYKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UaLMZaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UaLMaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_-o6SwEvxEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UaLMZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaLMZ6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaLMaKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UaLMZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaLMZ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaLMaKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UaVkdKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DpB9sEvyEemT5f_Ewhfs6A" target="_UaVkcKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UaVkdaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UaVkeaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UaVkdKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DpB9sEvyEemT5f_Ewhfs6A" target="_UaVkcKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UaVkdaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UaVkeaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_DN0BUEvyEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UaVkdqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaVkd6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaVkeKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UaVkdqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaVkd6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaVkeKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Ua8BZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7M57YEvwEemT5f_Ewhfs6A" target="_Ua8BYKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Ua8BZaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ua8BaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Ua8BZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7M57YEvwEemT5f_Ewhfs6A" target="_Ua8BYKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ua8BZaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ua8BaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ua8BZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ua8BZ6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ua8BaKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ua8BZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ua8BZ6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ua8BaKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UbpMBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4jT6oE2rEemQQPVBE79CWA" target="_UbpMAKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UbpMBaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UbpMCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UbpMBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4jT6oE2rEemQQPVBE79CWA" target="_UbpMAKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UbpMBaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UbpMCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_4jJikE2rEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UbpMBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UbpMB6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UbpMCKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UbpMBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbpMB6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbpMCKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Ub98JKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MccoQE2sEemQQPVBE79CWA" target="_Ub98IKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Ub98JaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ub98KaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Ub98JKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MccoQE2sEemQQPVBE79CWA" target="_Ub98IKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ub98JaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ub98KaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_McPz8E2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ub98JqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ub98J6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ub98KKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ub98JqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ub98J6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ub98KKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UcWWpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8PgDEE2sEemQQPVBE79CWA" target="_UcWWoKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UcWWpaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcWWqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UcWWpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8PgDEE2sEemQQPVBE79CWA" target="_UcWWoKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UcWWpaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UcWWqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8PYHQE2sEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UcWWpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcWWp6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcWWqKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UcWWpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UcWWp6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UcWWqKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UcuKFKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Tt3yAE2tEemQQPVBE79CWA" target="_UcuKEKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_UcuKFaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_UcuKGaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UcuKFKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Tt3yAE2tEemQQPVBE79CWA" target="_UcuKEKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UcuKFaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UcuKGaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiEquipment.uml#_Tt0usE2tEemQQPVBE79CWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UcuKFqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcuKF6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UcuKGKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UcuKFqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UcuKF6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UcuKGKawEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Uc6-ZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EM33QHspEemfSIWqmJMEQA" target="_Uc6-YKawEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Uc6-ZaawEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Uc6-aaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Uc6-ZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EM33QHspEemfSIWqmJMEQA" target="_Uc6-YKawEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Uc6-ZaawEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Uc6-aaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiEquipment.uml#_EMk8UHspEemfSIWqmJMEQA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Uc6-ZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uc6-Z6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uc6-aKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Uc6-ZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uc6-Z6awEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uc6-aKawEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_pUoawHsuEemfSIWqmJMEQA">
-    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_A84FcBgpEem7b6CPWW1OrA" path="/TapiModel/UmlProfiles/ClassDiagramStyleSheet.css"/>
-    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_A84sgBgpEem7b6CPWW1OrA" path="/TapiModel/TapiClassDiagram.css"/>
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_A84FcBgpEem7b6CPWW1OrA" path="/TapiModel/UmlProfiles/ClassDiagramStyleSheet.css"/>
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_A84sgBgpEem7b6CPWW1OrA" path="/TapiModel/TapiClassDiagram.css"/>
   </css:ModelStyleSheets>
   <notation:Diagram xmi:id="_4c8y0HswEemfSIWqmJMEQA" type="PapyrusUMLClassDiagram" name="EquipmentDataTypes" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_Ud59KXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="13420443">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59KnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud59K3sxEemfSIWqmJMEQA" x="-610" y="-128" width="340" height="20"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Ud5-pXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-pnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-p3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-qHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Ud5-qXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_Ud5-qnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_r240kERLEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-3HsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ud5-3XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_-1CEIERMEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5_D3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ud5_EHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_l6LE4ERTEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5_QnsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Ud5_Q3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Ud5_RHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Ud5_RXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud5_RnsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Ud5_R3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Ud5_SHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Ud5_SXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Ud5_SnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud5_S3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ud5_WnsxEemfSIWqmJMEQA" x="-158" y="842" width="321" height="121"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDG_3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDHAHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDHAXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHAnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDHA3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDHBHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_3ypNAEQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHNnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDHN3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_cC-A8EQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHaXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDHansxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_VTQLMEQtEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHnHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDHnXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_uHNXkEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDHz3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDH0HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_-5svQEQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIAnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDIA3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_j105QEQsEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDINXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDINnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_mig3EEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIaHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDIaXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDIansxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDIa3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDIbHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDIbXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDIbnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDIb3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDIcHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDIcXsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDIgHsxEemfSIWqmJMEQA" x="-178" y="390" width="341" height="181"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDInHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDInXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDInnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIn3sxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDIoHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDIoXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_h6N5gEvMEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDI03sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDI1HsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDI1XsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDI1nsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDI13sxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDI2HsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDI2XsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDI2nsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDI23sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDI3HsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDI63sxEemfSIWqmJMEQA" x="-18" y="670" width="441"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDI7HsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDI7XsxEemfSIWqmJMEQA" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDI7nsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDI73sxEemfSIWqmJMEQA" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDI8HsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_UeDI8XsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-          <details xmi:id="_UeDI8nsxEemfSIWqmJMEQA" key="visible" value="true"/>
+    <children xmi:type="notation:Shape" xmi:id="_Ud59KXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59KnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_qAD58DneEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud59K3sxEemfSIWqmJMEQA" x="-610" y="-128" width="340" height="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Ud5-pXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-pnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-p3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-qHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ud5-qXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_Ud5-qnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_r240kERLEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-3HsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ud5-3XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-1CEIERMEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5_D3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ud5_EHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_l6LE4ERTEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5_QnsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ud5_Q3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ud5_RHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ud5_RXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud5_RnsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ud5_R3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ud5_SHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ud5_SXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ud5_SnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud5_S3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ud5_WnsxEemfSIWqmJMEQA" x="-158" y="842" width="321" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDG_3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDHAHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDHAXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHAnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDHA3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDHBHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_3ypNAEQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHNnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDHN3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_cC-A8EQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHaXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDHansxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VTQLMEQtEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHnHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDHnXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_uHNXkEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDHz3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDH0HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-5svQEQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIAnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDIA3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_j105QEQsEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDINXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDINnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_mig3EEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIaHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDIaXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDIansxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDIa3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDIbHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDIbXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDIbnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDIb3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDIcHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDIcXsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDIgHsxEemfSIWqmJMEQA" x="-178" y="390" width="341" height="181"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDInHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDInXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDInnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIn3sxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDIoHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDIoXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_h6N5gEvMEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDI03sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDI1HsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDI1XsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDI1nsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDI13sxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDI2HsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDI2XsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDI2nsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDI23sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDI3HsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDI63sxEemfSIWqmJMEQA" x="-18" y="670" width="441"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDI7HsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDI7XsxEemfSIWqmJMEQA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDI7nsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDI73sxEemfSIWqmJMEQA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDI8HsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeDI8XsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeDI8nsxEemfSIWqmJMEQA" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="_UeDI83sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJJXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDJJnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJWHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDJWXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJi3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDJjHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJvnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDJv3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDJ6nsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDJ63sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKHXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDKHnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKUHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDKUXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKfHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDKfXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDKqHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDKqXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDKqnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDKq3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDKrHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDKrXsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDKrnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDKr3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDKsHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDKsXsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDKsnsxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDKs3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDKtHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDKtXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDKtnsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDK63sxEemfSIWqmJMEQA" x="670" y="-10" width="402" height="193"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDK7HsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDK7XsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDK7nsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDK73sxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDK8HsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDK8XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_LUifYkvHEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLI3sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDLJHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDLJXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDLJnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDLJ3sxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDLKHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDLKXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDLKnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDLK3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDLLHsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDLO3sxEemfSIWqmJMEQA" x="342" y="430" width="480"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDLVXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLVnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLV3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLWHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDLWXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDLWnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_y1arcD9MEemsT7Uwjmld0w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLjHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDLjXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_D-nvgDmkEemDl_QGWIY6yg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLv3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDLwHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_VlGeADmkEemDl_QGWIY6yg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDL8nsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_DfpPAHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_kGNzEG27Eeqjr-4srHPKHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_DfpPAXh7EeqVN_GB3rPx7g"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDL83sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDL9HsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDL9XsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDL9nsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDL93sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDL-HsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDL-XsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDL-nsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDL-3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDMCnsxEemfSIWqmJMEQA" x="679" y="-211" width="341" height="121"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDNansxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNa3sxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDNbHsxEemfSIWqmJMEQA" x="-607" y="-251" width="341" height="21"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDNg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNhnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDNh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDNiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_1yD_8EvHEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNunsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDNu3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_8L2MgEvHEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDN7XsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDN7nsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_AOW_sEvIEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOIHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOIXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOInsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOI3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOJHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOJXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOJnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOJ3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOKHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOKXsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOOHsxEemfSIWqmJMEQA" x="-558" y="210" width="521" height="121"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDOXHsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOXXsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_pNRy8DmuEem1ZNpCEF2XWQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOXnsxEemfSIWqmJMEQA" x="-610" y="-168" width="341" height="21"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDOX3sxEemfSIWqmJMEQA" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOYHsxEemfSIWqmJMEQA" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOYXsxEemfSIWqmJMEQA" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOYnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOY3sxEemfSIWqmJMEQA" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDOZHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiEquipment.uml#_Xh07QFojEemu443YKSGnxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOZXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDOZnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiEquipment.uml#_hywYgFojEemu443YKSGnxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOZ3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDOaHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiEquipment.uml#_jaS-EFojEemu443YKSGnxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOaXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDOansxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiEquipment.uml#_kYMJsFojEemu443YKSGnxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOa3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDObHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiEquipment.uml#_Y_ImwFojEemu443YKSGnxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDObXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDObnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiEquipment.uml#_bG_EEFojEemu443YKSGnxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOb3sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOcHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOcXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOcnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOc3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOgnsxEemfSIWqmJMEQA" x="-140" y="-200"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDOg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDOhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOhnsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeDOiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_PY9k0EvMEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDOunsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOu3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOvHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOvXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOvnsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDOv3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDOwHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDOwXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDOwnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDOw3sxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDO0nsxEemfSIWqmJMEQA" x="-458" y="670"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeDO3nsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO33sxEemfSIWqmJMEQA" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO4HsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDO4XsxEemfSIWqmJMEQA" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDO4nsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
-        <eAnnotations xmi:id="_UeDO43sxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-          <details xmi:id="_UeDO5HsxEemfSIWqmJMEQA" key="visible" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="_UeDI83sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_gLJ28EQvEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJJXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDJJnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_RUXMYEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJWHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDJWXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_XOQ_AEQwEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJi3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDJjHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_ayDQMj-NEeaRI-H69PghuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJvnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDJv3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D3ArkD9KEemsT7Uwjmld0w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDJ6nsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDJ63sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_EZB3EEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKHXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDKHnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_SWpBcEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKUHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDKUXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKfHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDKfXsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDKqHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDKqXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDKqnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDKq3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDKrHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDKrXsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDKrnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDKr3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDKsHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDKsXsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDKsnsxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDKs3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDKtHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDKtXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDKtnsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDK63sxEemfSIWqmJMEQA" x="670" y="-10" width="402" height="193"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDK7HsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDK7XsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDK7nsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDK73sxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDK8HsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDK8XsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_LUifYkvHEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLI3sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDLJHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDLJXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDLJnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDLJ3sxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDLKHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDLKXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDLKnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDLK3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDLLHsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDLO3sxEemfSIWqmJMEQA" x="342" y="430" width="480"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDLVXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLVnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLV3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLWHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDLWXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDLWnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_y1arcD9MEemsT7Uwjmld0w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLjHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDLjXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_D-nvgDmkEemDl_QGWIY6yg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLv3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDLwHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_VlGeADmkEemDl_QGWIY6yg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDL8nsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_DfpPAHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_kGNzEG27Eeqjr-4srHPKHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_DfpPAXh7EeqVN_GB3rPx7g"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDL83sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDL9HsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDL9XsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDL9nsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDL93sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDL-HsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDL-XsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDL-nsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDL-3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDMCnsxEemfSIWqmJMEQA" x="679" y="-211" width="341" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDNansxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNa3sxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_kfXSUDmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDNbHsxEemfSIWqmJMEQA" x="-607" y="-251" width="341" height="21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDNg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNhnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDNh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDNiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_1yD_8EvHEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNunsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDNu3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_8L2MgEvHEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDN7XsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDN7nsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_AOW_sEvIEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOIHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOIXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOInsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOI3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOJHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOJXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOJnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOJ3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOKHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOKXsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOOHsxEemfSIWqmJMEQA" x="-558" y="210" width="521" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDOXHsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOXXsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_pNRy8DmuEem1ZNpCEF2XWQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOXnsxEemfSIWqmJMEQA" x="-610" y="-168" width="341" height="21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDOX3sxEemfSIWqmJMEQA" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOYHsxEemfSIWqmJMEQA" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOYXsxEemfSIWqmJMEQA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOYnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOY3sxEemfSIWqmJMEQA" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDOZHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_Xh07QFojEemu443YKSGnxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOZXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDOZnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_hywYgFojEemu443YKSGnxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOZ3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDOaHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_jaS-EFojEemu443YKSGnxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOaXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDOansxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_kYMJsFojEemu443YKSGnxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOa3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDObHsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_Y_ImwFojEemu443YKSGnxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDObXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDObnsxEemfSIWqmJMEQA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiEquipment.uml#_bG_EEFojEemu443YKSGnxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOb3sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOcHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOcXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOcnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOc3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOgnsxEemfSIWqmJMEQA" x="-140" y="-200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDOg3sxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOhHsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDOhXsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOhnsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOh3sxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeDOiHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_PY9k0EvMEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDOunsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOu3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOvHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOvXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOvnsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDOv3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDOwHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDOwXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDOwnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDOw3sxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDO0nsxEemfSIWqmJMEQA" x="-458" y="670"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeDO3nsxEemfSIWqmJMEQA" type="Class_Shape" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO33sxEemfSIWqmJMEQA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO4HsxEemfSIWqmJMEQA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDO4XsxEemfSIWqmJMEQA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDO4nsxEemfSIWqmJMEQA" type="Class_AttributeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeDO43sxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeDO5HsxEemfSIWqmJMEQA" key="visible" value="true"/>
         </eAnnotations>
-        <children xsi:type="notation:Shape" xmi:id="_UeDO5XsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPF3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDPGHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPSnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDPS3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPfXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDPfnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDPqXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeDPqnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDP1XsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDP1nsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDP13sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDP2HsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDP2XsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDP2nsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDP23sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDP3HsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDP3XsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDP3nsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeDP33sxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeDP4HsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeDP4XsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeDP4nsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDP43sxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeDQGHsxEemfSIWqmJMEQA" x="670" y="570" width="400" height="120"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeM3eXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM3ensxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM3e3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM3fHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM3fXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeM3fnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_yWCIcEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM3sHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM3sXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_Q9fSkEQyEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM343sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM35HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_YrPlQEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4FnsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM4F3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_cpqioEQuEeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4SXsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM4SnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_Vlnd0EQ-EeasL6dcjI1vEA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4fHsxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM4fXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM4fnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM4f3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM4gHsxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM4gXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM4gnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM4g3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM4hHsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM4hXsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM4lHsxEemfSIWqmJMEQA" x="-507" y="-33" width="341" height="141"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeM4lXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM4lnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM4l3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4mHsxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM4mXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeM4mnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_Jl-hQEvGEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4zHsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM4zXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_djFI4EvGEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM4_3sxEemfSIWqmJMEQA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM5AHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM5AXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM5AnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM5A3sxEemfSIWqmJMEQA"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM5BHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM5BXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM5BnsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM5B3sxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM5CHsxEemfSIWqmJMEQA"/>
-      </children>
-      <element href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM5F3sxEemfSIWqmJMEQA" x="-731" y="445" width="481" height="101"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeM5bHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM5bXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM5bnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM5b3sxEemfSIWqmJMEQA" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM5cHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_UeM5cXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_5CPsaUvJEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM5o3sxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM5pHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_5CPsYkvJEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM51nsxEemfSIWqmJMEQA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_UeM513sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel" fontName="Segoe UI">
-          <eAnnotations xmi:id="_UeM52HsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-            <details xmi:id="_UeM52XsxEemfSIWqmJMEQA" key="fontHeight" value="true"/>
-            <details xmi:id="_UeM52nsxEemfSIWqmJMEQA" key="bold" value="true"/>
-            <details xmi:id="_UeM523sxEemfSIWqmJMEQA" key="italic" value="true"/>
-            <details xmi:id="_UeM53HsxEemfSIWqmJMEQA" key="fontColor" value="true"/>
+        <children xmi:type="notation:Shape" xmi:id="_UeDO5XsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_X1q3Qj-QEeaRI-H69PghuA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPF3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDPGHsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_vtnigEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPSnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDPS3sxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_-LKxMEvNEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPfXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDPfnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDPqXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeDPqnsxEemfSIWqmJMEQA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDP1XsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDP1nsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDP13sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDP2HsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDP2XsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDP2nsxEemfSIWqmJMEQA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDP23sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDP3HsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDP3XsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDP3nsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeDP33sxEemfSIWqmJMEQA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeDP4HsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeDP4XsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeDP4nsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDP43sxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeDQGHsxEemfSIWqmJMEQA" x="670" y="570" width="400" height="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeM3eXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM3ensxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM3e3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM3fHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM3fXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeM3fnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_yWCIcEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM3sHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM3sXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Q9fSkEQyEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM343sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM35HsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_YrPlQEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4FnsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM4F3sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_cpqioEQuEeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4SXsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM4SnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Vlnd0EQ-EeasL6dcjI1vEA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4fHsxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM4fXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM4fnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM4f3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM4gHsxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM4gXsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM4gnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM4g3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM4hHsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM4hXsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM4lHsxEemfSIWqmJMEQA" x="-507" y="-33" width="341" height="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeM4lXsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM4lnsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM4l3sxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4mHsxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM4mXsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeM4mnsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_Jl-hQEvGEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4zHsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM4zXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_djFI4EvGEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM4_3sxEemfSIWqmJMEQA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM5AHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM5AXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM5AnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM5A3sxEemfSIWqmJMEQA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM5BHsxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM5BXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM5BnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM5B3sxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM5CHsxEemfSIWqmJMEQA"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM5F3sxEemfSIWqmJMEQA" x="-731" y="445" width="481" height="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UeM5bHsxEemfSIWqmJMEQA" type="DataType_Shape" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM5bXsxEemfSIWqmJMEQA" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM5bnsxEemfSIWqmJMEQA" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM5b3sxEemfSIWqmJMEQA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM5cHsxEemfSIWqmJMEQA" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_UeM5cXsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_5CPsaUvJEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM5o3sxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM5pHsxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_5CPsYkvJEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM51nsxEemfSIWqmJMEQA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UeM513sxEemfSIWqmJMEQA" type="Property_DataTypeAttributeLabel" fontName="Segoe UI">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeM52HsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM52XsxEemfSIWqmJMEQA" key="fontHeight" value="true"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM52nsxEemfSIWqmJMEQA" key="bold" value="true"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM523sxEemfSIWqmJMEQA" key="italic" value="true"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM53HsxEemfSIWqmJMEQA" key="fontColor" value="true"/>
           </eAnnotations>
-          <element href="TapiEquipment.uml#_5CPsZUvJEemT5f_Ewhfs6A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM6DnsxEemfSIWqmJMEQA"/>
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_5CPsZUvJEemT5f_Ewhfs6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM6DnsxEemfSIWqmJMEQA"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM6D3sxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM6EHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM6EXsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6EnsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM6D3sxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM6EHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM6EXsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6EnsxEemfSIWqmJMEQA"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_UeM6E3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_UeM6FHsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_UeM6FXsxEemfSIWqmJMEQA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_UeM6FnsxEemfSIWqmJMEQA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6F3sxEemfSIWqmJMEQA"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UeM6E3sxEemfSIWqmJMEQA" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UeM6FHsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UeM6FXsxEemfSIWqmJMEQA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UeM6FnsxEemfSIWqmJMEQA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6F3sxEemfSIWqmJMEQA"/>
       </children>
-      <element href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6JnsxEemfSIWqmJMEQA" x="-18" y="210" width="541" height="121"/>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6JnsxEemfSIWqmJMEQA" x="-18" y="210" width="541" height="121"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_UeM6QXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="12632256">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM6QnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
-      <element href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_UeM6Q3sxEemfSIWqmJMEQA" x="-607" y="-211" width="341" height="21"/>
+    <children xmi:type="notation:Shape" xmi:id="_UeM6QXsxEemfSIWqmJMEQA" type="Comment_Shape" fillColor="12632256">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM6QnsxEemfSIWqmJMEQA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="TapiEquipment.uml#_87bG8ElkEemT5f_Ewhfs6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UeM6Q3sxEemfSIWqmJMEQA" x="-607" y="-211" width="341" height="21"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_GLtMoHh7EeqVN_GB3rPx7g" type="DataType_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_GLtzsHh7EeqVN_GB3rPx7g" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_GLtzsXh7EeqVN_GB3rPx7g" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_GLtzsnh7EeqVN_GB3rPx7g" y="15"/>
+    <children xmi:type="notation:Shape" xmi:id="_GLtMoHh7EeqVN_GB3rPx7g" type="DataType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GLtzsHh7EeqVN_GB3rPx7g" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GLtzsXh7EeqVN_GB3rPx7g" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GLtzsnh7EeqVN_GB3rPx7g" y="15"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_GLuawHh7EeqVN_GB3rPx7g" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_JYc1cHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_FDES0G21Eeqjr-4srHPKHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_JYc1cXh7EeqVN_GB3rPx7g"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GLuawHh7EeqVN_GB3rPx7g" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_JYc1cHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_FDES0G21Eeqjr-4srHPKHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JYc1cXh7EeqVN_GB3rPx7g"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_JYdcgHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_bZrIcG21Eeqjr-4srHPKHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_JYdcgXh7EeqVN_GB3rPx7g"/>
+        <children xmi:type="notation:Shape" xmi:id="_JYdcgHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_bZrIcG21Eeqjr-4srHPKHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JYdcgXh7EeqVN_GB3rPx7g"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_JYeDkHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
-          <element href="TapiEquipment.uml#_mPn-UG21Eeqjr-4srHPKHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_JYeDkXh7EeqVN_GB3rPx7g"/>
+        <children xmi:type="notation:Shape" xmi:id="_JYeDkHh7EeqVN_GB3rPx7g" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiEquipment.uml#_mPn-UG21Eeqjr-4srHPKHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JYeDkXh7EeqVN_GB3rPx7g"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_GLuawXh7EeqVN_GB3rPx7g"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_GLuawnh7EeqVN_GB3rPx7g"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_GLuaw3h7EeqVN_GB3rPx7g"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GLuaxHh7EeqVN_GB3rPx7g"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GLuawXh7EeqVN_GB3rPx7g"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GLuawnh7EeqVN_GB3rPx7g"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GLuaw3h7EeqVN_GB3rPx7g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GLuaxHh7EeqVN_GB3rPx7g"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_GLuaxXh7EeqVN_GB3rPx7g" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_GLuaxnh7EeqVN_GB3rPx7g"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_GLuax3h7EeqVN_GB3rPx7g"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_GLuayHh7EeqVN_GB3rPx7g"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GLuayXh7EeqVN_GB3rPx7g"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GLuaxXh7EeqVN_GB3rPx7g" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GLuaxnh7EeqVN_GB3rPx7g"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GLuax3h7EeqVN_GB3rPx7g"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GLuayHh7EeqVN_GB3rPx7g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GLuayXh7EeqVN_GB3rPx7g"/>
       </children>
-      <element href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GLtMoXh7EeqVN_GB3rPx7g" x="260" y="-220"/>
+      <element xmi:type="uml:DataType" href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GLtMoXh7EeqVN_GB3rPx7g" x="260" y="-220"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o3Dq0KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o3Dq0aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3Dq06axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o3Dq0KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3Dq0aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3Dq06axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o3Dq0qaxEeqJcvXkREZ1XQ" x="42" y="842"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3Dq0qaxEeqJcvXkREZ1XQ" x="42" y="842"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o3r88KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o3r88aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3r886axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o3r88KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3r88aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3r886axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o3r88qaxEeqJcvXkREZ1XQ" x="22" y="390"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3r88qaxEeqJcvXkREZ1XQ" x="22" y="390"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o4zXQKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o4zXQaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o4zXQ6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o4zXQKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4zXQaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4zXQ6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o4zXQqaxEeqJcvXkREZ1XQ" x="182" y="670"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4zXQqaxEeqJcvXkREZ1XQ" x="182" y="670"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o5pEwKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o5pEwaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o5pEw6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_o5pEwKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o5pEwaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5pEw6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o5pEwqaxEeqJcvXkREZ1XQ" x="870" y="-10"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o5pEwqaxEeqJcvXkREZ1XQ" x="870" y="-10"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o7PnQKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o7PnQaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7PnQ6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_o7PnQKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o7PnQaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7PnQ6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o7PnQqaxEeqJcvXkREZ1XQ" x="870" y="-110"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7PnQqaxEeqJcvXkREZ1XQ" x="870" y="-110"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o7Z_UKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o7Z_UaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7Z_U6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o7Z_UKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o7Z_UaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7Z_U6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o7Z_UqaxEeqJcvXkREZ1XQ" x="542" y="430"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7Z_UqaxEeqJcvXkREZ1XQ" x="542" y="430"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o7vWgKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o7vWgaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7vWg6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
+    <children xmi:type="notation:Shape" xmi:id="_o7vWgKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o7vWgaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7vWg6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o7vWgqaxEeqJcvXkREZ1XQ" x="879" y="-211"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7vWgqaxEeqJcvXkREZ1XQ" x="879" y="-211"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o8j14KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o8j14aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o8j146axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o8j14KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o8j14aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o8j146axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o8j14qaxEeqJcvXkREZ1XQ" x="-358" y="210"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o8j14qaxEeqJcvXkREZ1XQ" x="-358" y="210"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o9JrwKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o9JrwaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9KS0KaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_o9JrwKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9JrwaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9KS0KaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o9JrwqaxEeqJcvXkREZ1XQ" x="223" y="-122"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9JrwqaxEeqJcvXkREZ1XQ" x="223" y="-122"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o9WgEKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o9WgEaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9XHIKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o9WgEKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9WgEaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9XHIKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o9WgEqaxEeqJcvXkREZ1XQ" x="-258" y="670"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9WgEqaxEeqJcvXkREZ1XQ" x="-258" y="670"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o-P38KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o-QfAKaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o-QfAqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_o-P38KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o-QfAKaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o-QfAqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o-QfAaaxEeqJcvXkREZ1XQ" x="870" y="570"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o-QfAaaxEeqJcvXkREZ1XQ" x="870" y="570"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o_FlcKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o_FlcaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_Flc6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <children xmi:type="notation:Shape" xmi:id="_o_FlcKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o_FlcaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_Flc6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o_FlcqaxEeqJcvXkREZ1XQ" x="870" y="470"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o_FlcqaxEeqJcvXkREZ1XQ" x="870" y="470"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_o_U2AKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_o_U2AaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_U2A6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_o_U2AKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o_U2AaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_U2A6axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_o_U2AqaxEeqJcvXkREZ1XQ" x="-307" y="-33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o_U2AqaxEeqJcvXkREZ1XQ" x="-307" y="-33"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_pAEc4KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_pAEc4aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAFD8KaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_pAEc4KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pAEc4aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pAFD8KaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pAEc4qaxEeqJcvXkREZ1XQ" x="-531" y="445"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pAEc4qaxEeqJcvXkREZ1XQ" x="-531" y="445"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_pAhv4KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_pAhv4aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAhv46axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
+    <children xmi:type="notation:Shape" xmi:id="_pAhv4KaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pAhv4aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pAhv46axEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pAhv4qaxEeqJcvXkREZ1XQ" x="182" y="210"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pAhv4qaxEeqJcvXkREZ1XQ" x="182" y="210"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_pBKCAKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_pBKCAaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pBKpEKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_pBKCAKaxEeqJcvXkREZ1XQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pBKCAaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pBKpEKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pBKCAqaxEeqJcvXkREZ1XQ" x="460" y="-220"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pBKCAqaxEeqJcvXkREZ1XQ" x="460" y="-220"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_4c8y0XswEemfSIWqmJMEQA" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_4c8y0nswEemfSIWqmJMEQA"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_4c8y03swEemfSIWqmJMEQA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_4c8y0XswEemfSIWqmJMEQA" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_4c8y0nswEemfSIWqmJMEQA"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_4c8y03swEemfSIWqmJMEQA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
     </styles>
-    <element href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_Ud59LHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59LXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59LnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59L3sxEemfSIWqmJMEQA" x="1" y="37"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59MHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59MXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59MnsxEemfSIWqmJMEQA" x="-4" y="-56"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Ud59M3sxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_4VIVcEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ud59NHsxEemfSIWqmJMEQA" points="[-278, 331, -643984, -643984]$[-278, 423, -643984, -643984]$[-178, 423, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59NXsxEemfSIWqmJMEQA" id="(0.5374280230326296,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59NnsxEemfSIWqmJMEQA" id="(0.0,0.18232044198895028)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Ud59VHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDNg3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59VXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59VnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59V3sxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud59WHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud59WXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud59WnsxEemfSIWqmJMEQA" x="-142" y="8"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Ud59W3sxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_DjvGcEvQEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ud59XHsxEemfSIWqmJMEQA" points="[670, 55, -643984, -643984]$[-123, 55, -643984, -643984]$[-123, 210, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59XXsxEemfSIWqmJMEQA" id="(0.0,0.33678756476683935)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud59XnsxEemfSIWqmJMEQA" id="(0.8330134357005758,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Ud5-jHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDK7HsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-jXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud5-jnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-j3sxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Ud5-kHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ud5-kXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Ud5-knsxEemfSIWqmJMEQA" x="46" y="5"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Ud5-k3sxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_-4yPsEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Ud5-lHsxEemfSIWqmJMEQA" points="[523, 262, -643984, -643984]$[602, 262, -643984, -643984]$[602, 430, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud5-lXsxEemfSIWqmJMEQA" id="(1.0,0.4132231404958678)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Ud5-lnsxEemfSIWqmJMEQA" id="(0.5416666666666666,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDIkXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDIknsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDIk3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIlHsxEemfSIWqmJMEQA" x="13" y="5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDIlXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDIlnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDIl3sxEemfSIWqmJMEQA" x="8" y="-4"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDImHsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_nll2AEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDImXsxEemfSIWqmJMEQA" points="[-340, 200, -643984, -643984]$[-340, 96, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDImnsxEemfSIWqmJMEQA" id="(0.43761996161228406,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDIm3sxEemfSIWqmJMEQA" id="(0.5190615835777126,0.9858156028368794)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDLPHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDInHsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLPXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDLPnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLP3sxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDLQHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDLQXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDLQnsxEemfSIWqmJMEQA" x="152" y="-14"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDLQ3sxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_Zkij0EvTEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDLRHsxEemfSIWqmJMEQA" points="[670, 613, -643984, -643984]$[261, 613, -643984, -643984]$[261, 670, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDLRXsxEemfSIWqmJMEQA" id="(0.0,0.35833333333333334)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDLRnsxEemfSIWqmJMEQA" id="(0.6349206349206349,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDMC3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeM5bHsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMDHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMDXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMDnsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMD3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMEHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMEXsxEemfSIWqmJMEQA" x="59" y="11"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDMEnsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_Aez84EvQEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDME3sxEemfSIWqmJMEQA" points="[670, 118, -643984, -643984]$[262, 118, -643984, -643984]$[262, 210, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMFHsxEemfSIWqmJMEQA" id="(0.0,0.6632124352331606)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMFXsxEemfSIWqmJMEQA" id="(0.5175600739371534,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDMM3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMNHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMNXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMNnsxEemfSIWqmJMEQA" x="1" y="37"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDMN3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDMOHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDMOXsxEemfSIWqmJMEQA" x="-73" y="5"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDMOnsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_HS8_oEvPEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDMO3sxEemfSIWqmJMEQA" points="[261, 331, -643984, -643984]$[261, 432, -643984, -643984]$[163, 432, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMPHsxEemfSIWqmJMEQA" id="(0.5157116451016636,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDMPXsxEemfSIWqmJMEQA" id="(1.0,0.22099447513812154)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDNbXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNbnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNb3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNcHsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNcXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNcnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNc3sxEemfSIWqmJMEQA" x="-131" y="4"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDNdHsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_j_huQEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDNdXsxEemfSIWqmJMEQA" points="[-610, 445, -643984, -643984]$[-610, 43, -643984, -643984]$[-507, 43, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNdnsxEemfSIWqmJMEQA" id="(0.2515592515592516,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNd3sxEemfSIWqmJMEQA" id="(0.0,0.5390070921985816)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDNeHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNeXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNe3sxEemfSIWqmJMEQA" x="-11" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDNfHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDNfXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDNfnsxEemfSIWqmJMEQA" x="2" y="3"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDNf3sxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_U8ovIEvUEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDNgHsxEemfSIWqmJMEQA" points="[859, -90, -643984, -643984]$[859, -10, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNgXsxEemfSIWqmJMEQA" id="(0.5278592375366569,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDNgnsxEemfSIWqmJMEQA" id="(0.4701492537313433,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeDO03sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDOg3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO1HsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDO1XsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDO1nsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeDO13sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeDO2HsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeDO2XsxEemfSIWqmJMEQA" x="376" y="-47"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeDO2nsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_XJAVgEvTEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeDO23sxEemfSIWqmJMEQA" points="[669, 580, -643984, -643984]$[-160, 580, -643984, -643984]$[-160, 669, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDO3HsxEemfSIWqmJMEQA" id="(0.0,0.08333333333333333)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeDO3XsxEemfSIWqmJMEQA" id="(0.4226950354609929,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM7SnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7S3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7THsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7TXsxEemfSIWqmJMEQA" y="38"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7TnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7UHsxEemfSIWqmJMEQA" x="-3" y="-13"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM7UXsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_2PzAoEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM7UnsxEemfSIWqmJMEQA" points="[-262, 480, -643984, -643984]$[-188, 480, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7U3sxEemfSIWqmJMEQA" id="(0.9937629937629938,0.44554455445544555)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7VHsxEemfSIWqmJMEQA" id="(0.0,0.5524861878453039)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM7VXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDO3nsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7VnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7V3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7WHsxEemfSIWqmJMEQA" x="-107" y="-5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7WXsxEemfSIWqmJMEQA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7WnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7W3sxEemfSIWqmJMEQA" x="-127" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7XHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7XXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7XnsxEemfSIWqmJMEQA" x="19" y="-46"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7X3sxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7YHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7YXsxEemfSIWqmJMEQA" x="-16" y="65"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7YnsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7Y3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7ZHsxEemfSIWqmJMEQA" x="13" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7ZXsxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM7ZnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM7Z3sxEemfSIWqmJMEQA" x="-18" y="-12"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM7aHsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM7bHsxEemfSIWqmJMEQA" points="[860, 147, -643984, -643984]$[860, 560, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7bXsxEemfSIWqmJMEQA" id="(0.4975124378109453,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM7bnsxEemfSIWqmJMEQA" id="(0.5,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM7_nsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDInHsxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM7_3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8AHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8AXsxEemfSIWqmJMEQA" y="40"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8AnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8A3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8BHsxEemfSIWqmJMEQA" x="-83" y="5"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8BXsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_GURUYEvQEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8BnsxEemfSIWqmJMEQA" points="[260, 773, -643984, -643984]$[260, 920, -643984, -643984]$[161, 920, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8B3sxEemfSIWqmJMEQA" id="(0.6303854875283447,0.9807692307692307)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8CHsxEemfSIWqmJMEQA" id="(0.9906542056074766,0.6446280991735537)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM8JnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDK7HsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8J3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8KHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8KXsxEemfSIWqmJMEQA" x="-1" y="38"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8KnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8K3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8LHsxEemfSIWqmJMEQA" x="-5" y="13"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8LXsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_KbhTEEvPEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8LnsxEemfSIWqmJMEQA" points="[289, 480, -643984, -643984]$[110, 480, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8L3sxEemfSIWqmJMEQA" id="(0.0,0.6)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8MHsxEemfSIWqmJMEQA" id="(1.0,0.5524861878453039)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM8MXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8MnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8M3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8NHsxEemfSIWqmJMEQA" x="94" y="5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8NXsxEemfSIWqmJMEQA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8NnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8N3sxEemfSIWqmJMEQA" x="114" y="-1"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8OHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
-        <eAnnotations xmi:id="_UeM8OXsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
-          <details xmi:id="_UeM8OnsxEemfSIWqmJMEQA" key="visible" value="true"/>
+    <element xmi:type="uml:Package" href="TapiEquipment.uml#_NcVIoEdWEeasL6dcjI1vEA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Ud59LHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59LXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59LnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59L3sxEemfSIWqmJMEQA" x="1" y="37"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59MHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59MXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59MnsxEemfSIWqmJMEQA" x="-4" y="-56"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ud59M3sxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_4VIVcEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ud59NHsxEemfSIWqmJMEQA" points="[-278, 331, -643984, -643984]$[-278, 423, -643984, -643984]$[-178, 423, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59NXsxEemfSIWqmJMEQA" id="(0.5374280230326296,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59NnsxEemfSIWqmJMEQA" id="(0.0,0.18232044198895028)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Ud59VHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDNg3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59VXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59VnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59V3sxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud59WHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud59WXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud59WnsxEemfSIWqmJMEQA" x="-142" y="8"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ud59W3sxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_DjvGcEvQEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ud59XHsxEemfSIWqmJMEQA" points="[670, 55, -643984, -643984]$[-123, 55, -643984, -643984]$[-123, 210, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59XXsxEemfSIWqmJMEQA" id="(0.0,0.33678756476683935)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud59XnsxEemfSIWqmJMEQA" id="(0.8330134357005758,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Ud5-jHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDK7HsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-jXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud5-jnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-j3sxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ud5-kHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ud5-kXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud5-knsxEemfSIWqmJMEQA" x="46" y="5"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ud5-k3sxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_-4yPsEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ud5-lHsxEemfSIWqmJMEQA" points="[523, 262, -643984, -643984]$[602, 262, -643984, -643984]$[602, 430, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud5-lXsxEemfSIWqmJMEQA" id="(1.0,0.4132231404958678)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ud5-lnsxEemfSIWqmJMEQA" id="(0.5416666666666666,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDIkXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDIknsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDIk3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIlHsxEemfSIWqmJMEQA" x="13" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDIlXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDIlnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDIl3sxEemfSIWqmJMEQA" x="8" y="-4"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDImHsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_nll2AEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDImXsxEemfSIWqmJMEQA" points="[-340, 200, -643984, -643984]$[-340, 96, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDImnsxEemfSIWqmJMEQA" id="(0.43761996161228406,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDIm3sxEemfSIWqmJMEQA" id="(0.5190615835777126,0.9858156028368794)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDLPHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDInHsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLPXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDLPnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLP3sxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDLQHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDLQXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDLQnsxEemfSIWqmJMEQA" x="152" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDLQ3sxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_Zkij0EvTEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDLRHsxEemfSIWqmJMEQA" points="[670, 613, -643984, -643984]$[261, 613, -643984, -643984]$[261, 670, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDLRXsxEemfSIWqmJMEQA" id="(0.0,0.35833333333333334)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDLRnsxEemfSIWqmJMEQA" id="(0.6349206349206349,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDMC3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeM5bHsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMDHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMDXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMDnsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMD3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMEHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMEXsxEemfSIWqmJMEQA" x="59" y="11"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDMEnsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_Aez84EvQEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDME3sxEemfSIWqmJMEQA" points="[670, 118, -643984, -643984]$[262, 118, -643984, -643984]$[262, 210, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMFHsxEemfSIWqmJMEQA" id="(0.0,0.6632124352331606)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMFXsxEemfSIWqmJMEQA" id="(0.5175600739371534,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDMM3sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM5bHsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMNHsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMNXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMNnsxEemfSIWqmJMEQA" x="1" y="37"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDMN3sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDMOHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDMOXsxEemfSIWqmJMEQA" x="-73" y="5"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDMOnsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_HS8_oEvPEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDMO3sxEemfSIWqmJMEQA" points="[261, 331, -643984, -643984]$[261, 432, -643984, -643984]$[163, 432, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMPHsxEemfSIWqmJMEQA" id="(0.5157116451016636,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDMPXsxEemfSIWqmJMEQA" id="(1.0,0.22099447513812154)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDNbXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeM3eXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNbnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNb3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNcHsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNcXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNcnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNc3sxEemfSIWqmJMEQA" x="-131" y="4"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDNdHsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_j_huQEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDNdXsxEemfSIWqmJMEQA" points="[-610, 445, -643984, -643984]$[-610, 43, -643984, -643984]$[-507, 43, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNdnsxEemfSIWqmJMEQA" id="(0.2515592515592516,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNd3sxEemfSIWqmJMEQA" id="(0.0,0.5390070921985816)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDNeHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNeXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNe3sxEemfSIWqmJMEQA" x="-11" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDNfHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDNfXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDNfnsxEemfSIWqmJMEQA" x="2" y="3"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDNf3sxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_U8ovIEvUEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDNgHsxEemfSIWqmJMEQA" points="[859, -90, -643984, -643984]$[859, -10, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNgXsxEemfSIWqmJMEQA" id="(0.5278592375366569,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDNgnsxEemfSIWqmJMEQA" id="(0.4701492537313433,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeDO03sxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDOg3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO1HsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDO1XsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDO1nsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeDO13sxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeDO2HsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeDO2XsxEemfSIWqmJMEQA" x="376" y="-47"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeDO2nsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_XJAVgEvTEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeDO23sxEemfSIWqmJMEQA" points="[669, 580, -643984, -643984]$[-160, 580, -643984, -643984]$[-160, 669, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDO3HsxEemfSIWqmJMEQA" id="(0.0,0.08333333333333333)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeDO3XsxEemfSIWqmJMEQA" id="(0.4226950354609929,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM7SnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeM4lXsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7S3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7THsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7TXsxEemfSIWqmJMEQA" y="38"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7TnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7UHsxEemfSIWqmJMEQA" x="-3" y="-13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM7UXsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_2PzAoEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM7UnsxEemfSIWqmJMEQA" points="[-262, 480, -643984, -643984]$[-188, 480, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7U3sxEemfSIWqmJMEQA" id="(0.9937629937629938,0.44554455445544555)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7VHsxEemfSIWqmJMEQA" id="(0.0,0.5524861878453039)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM7VXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDI7HsxEemfSIWqmJMEQA" target="_UeDO3nsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7VnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7V3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7WHsxEemfSIWqmJMEQA" x="-107" y="-5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7WXsxEemfSIWqmJMEQA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7WnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7W3sxEemfSIWqmJMEQA" x="-127" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7XHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7XXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7XnsxEemfSIWqmJMEQA" x="19" y="-46"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7X3sxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7YHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7YXsxEemfSIWqmJMEQA" x="-16" y="65"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7YnsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7Y3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7ZHsxEemfSIWqmJMEQA" x="13" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7ZXsxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM7ZnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM7Z3sxEemfSIWqmJMEQA" x="-18" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM7aHsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM7bHsxEemfSIWqmJMEQA" points="[860, 147, -643984, -643984]$[860, 560, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7bXsxEemfSIWqmJMEQA" id="(0.4975124378109453,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM7bnsxEemfSIWqmJMEQA" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM7_nsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDInHsxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM7_3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8AHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8AXsxEemfSIWqmJMEQA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8AnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8A3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8BHsxEemfSIWqmJMEQA" x="-83" y="5"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8BXsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_GURUYEvQEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8BnsxEemfSIWqmJMEQA" points="[260, 773, -643984, -643984]$[260, 920, -643984, -643984]$[161, 920, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8B3sxEemfSIWqmJMEQA" id="(0.6303854875283447,0.9807692307692307)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8CHsxEemfSIWqmJMEQA" id="(0.9906542056074766,0.6446280991735537)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM8JnsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDK7HsxEemfSIWqmJMEQA" target="_UeDG_3sxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8J3sxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8KHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8KXsxEemfSIWqmJMEQA" x="-1" y="38"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8KnsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8K3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8LHsxEemfSIWqmJMEQA" x="-5" y="13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8LXsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_KbhTEEvPEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8LnsxEemfSIWqmJMEQA" points="[289, 480, -643984, -643984]$[110, 480, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8L3sxEemfSIWqmJMEQA" id="(0.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8MHsxEemfSIWqmJMEQA" id="(1.0,0.5524861878453039)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM8MXsxEemfSIWqmJMEQA" type="Association_Edge" source="_UeDO3nsxEemfSIWqmJMEQA" target="_UeDI7HsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8MnsxEemfSIWqmJMEQA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8M3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8NHsxEemfSIWqmJMEQA" x="94" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8NXsxEemfSIWqmJMEQA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8NnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8N3sxEemfSIWqmJMEQA" x="114" y="-1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8OHsxEemfSIWqmJMEQA" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UeM8OXsxEemfSIWqmJMEQA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UeM8OnsxEemfSIWqmJMEQA" key="visible" value="true"/>
         </eAnnotations>
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8O3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8PHsxEemfSIWqmJMEQA" x="73" y="-17"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8O3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8PHsxEemfSIWqmJMEQA" x="73" y="-17"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8PXsxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8PnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8P3sxEemfSIWqmJMEQA" x="-53" y="15"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8PXsxEemfSIWqmJMEQA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8PnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8P3sxEemfSIWqmJMEQA" x="-53" y="15"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8QHsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8QXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8QnsxEemfSIWqmJMEQA" x="15" y="14"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8QHsxEemfSIWqmJMEQA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8QXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8QnsxEemfSIWqmJMEQA" x="15" y="14"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8Q3sxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8RHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8RXsxEemfSIWqmJMEQA" x="-26" y="-16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8Q3sxEemfSIWqmJMEQA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8RHsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8RXsxEemfSIWqmJMEQA" x="-26" y="-16"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8RnsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8SnsxEemfSIWqmJMEQA" points="[1060, 520, -643984, -643984]$[1120, 520, -643984, -643984]$[1120, 60, -643984, -643984]$[1062, 60, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8S3sxEemfSIWqmJMEQA" id="(1.0,0.5)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8THsxEemfSIWqmJMEQA" id="(1.0,0.41450777202072536)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8RnsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8SnsxEemfSIWqmJMEQA" points="[1060, 520, -643984, -643984]$[1120, 520, -643984, -643984]$[1120, 60, -643984, -643984]$[1062, 60, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8S3sxEemfSIWqmJMEQA" id="(1.0,0.5)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8THsxEemfSIWqmJMEQA" id="(1.0,0.41450777202072536)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM8TXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDOg3sxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8TnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8UHsxEemfSIWqmJMEQA" y="40"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM8TXsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDOg3sxEemfSIWqmJMEQA" target="_Ud5-pXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8TnsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8T3sxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8UHsxEemfSIWqmJMEQA" y="40"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8UXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8UnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8U3sxEemfSIWqmJMEQA" x="-100" y="4"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8UXsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8UnsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8U3sxEemfSIWqmJMEQA" x="-100" y="4"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8VHsxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_Ja5uIEvQEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8VXsxEemfSIWqmJMEQA" points="[-280, 773, -643984, -643984]$[-280, 920, -643984, -643984]$[-159, 920, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8VnsxEemfSIWqmJMEQA" id="(0.2524822695035461,0.9807692307692307)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8V3sxEemfSIWqmJMEQA" id="(0.0,0.6446280991735537)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8VHsxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_Ja5uIEvQEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8VXsxEemfSIWqmJMEQA" points="[-280, 773, -643984, -643984]$[-280, 920, -643984, -643984]$[-159, 920, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8VnsxEemfSIWqmJMEQA" id="(0.2524822695035461,0.9807692307692307)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8V3sxEemfSIWqmJMEQA" id="(0.0,0.6446280991735537)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UeM8eHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM4lXsxEemfSIWqmJMEQA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8eXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8ensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8e3sxEemfSIWqmJMEQA" y="40"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UeM8eHsxEemfSIWqmJMEQA" type="Usage_Edge" source="_UeDNg3sxEemfSIWqmJMEQA" target="_UeM4lXsxEemfSIWqmJMEQA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8eXsxEemfSIWqmJMEQA" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8ensxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8e3sxEemfSIWqmJMEQA" y="40"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UeM8fHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UeM8fXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UeM8fnsxEemfSIWqmJMEQA" x="-5" y="1"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UeM8fHsxEemfSIWqmJMEQA" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeM8fXsxEemfSIWqmJMEQA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UeM8fnsxEemfSIWqmJMEQA" x="-5" y="1"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UeM8f3sxEemfSIWqmJMEQA"/>
-      <element href="TapiEquipment.uml#_7JO0wEvOEemT5f_Ewhfs6A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UeM8gHsxEemfSIWqmJMEQA" points="[-444, 320, -643984, -643984]$[-444, 434, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8gXsxEemfSIWqmJMEQA" id="(0.2380038387715931,0.9917355371900827)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UeM8gnsxEemfSIWqmJMEQA" id="(0.6174636174636174,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UeM8f3sxEemfSIWqmJMEQA"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_7JO0wEvOEemT5f_Ewhfs6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UeM8gHsxEemfSIWqmJMEQA" points="[-444, 320, -643984, -643984]$[-444, 434, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8gXsxEemfSIWqmJMEQA" id="(0.2380038387715931,0.9917355371900827)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeM8gnsxEemfSIWqmJMEQA" id="(0.6174636174636174,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_TqTqUHh8EeqVN_GB3rPx7g" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_GLtMoHh7EeqVN_GB3rPx7g">
-      <children xsi:type="notation:DecorationNode" xmi:id="_TqTqU3h8EeqVN_GB3rPx7g" type="Usage_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TqTqVHh8EeqVN_GB3rPx7g" y="40"/>
+    <edges xmi:type="notation:Connector" xmi:id="_TqTqUHh8EeqVN_GB3rPx7g" type="Usage_Edge" source="_UeDLVXsxEemfSIWqmJMEQA" target="_GLtMoHh7EeqVN_GB3rPx7g">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TqTqU3h8EeqVN_GB3rPx7g" type="Usage_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TqTqVHh8EeqVN_GB3rPx7g" y="40"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TqURYHh8EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TqURYXh8EeqVN_GB3rPx7g" x="-5" y="13"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TqURYHh8EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TqURYXh8EeqVN_GB3rPx7g" x="-5" y="13"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_TqTqUXh8EeqVN_GB3rPx7g"/>
-      <element href="TapiEquipment.uml#_TqIEIHh8EeqVN_GB3rPx7g"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TqTqUnh8EeqVN_GB3rPx7g" points="[679, -180, -643984, -643984]$[541, -180, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNblgHh8EeqVN_GB3rPx7g" id="(0.0,0.256198347107438)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UNblgXh8EeqVN_GB3rPx7g" id="(1.0,0.31007751937984496)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_TqTqUXh8EeqVN_GB3rPx7g"/>
+      <element xmi:type="uml:Usage" href="TapiEquipment.uml#_TqIEIHh8EeqVN_GB3rPx7g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqTqUnh8EeqVN_GB3rPx7g" points="[679, -180, -643984, -643984]$[541, -180, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UNblgHh8EeqVN_GB3rPx7g" id="(0.0,0.256198347107438)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UNblgXh8EeqVN_GB3rPx7g" id="(1.0,0.31007751937984496)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o3Dq1KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Ud5-pXsxEemfSIWqmJMEQA" target="_o3Dq0KaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o3Dq1aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3Dq2aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o3Dq1KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Ud5-pXsxEemfSIWqmJMEQA" target="_o3Dq0KaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o3Dq1aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3Dq2aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_iYrMkEvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o3Dq1qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3Dq16axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3Dq2KaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3Dq1qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3Dq16axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3Dq2KaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o3r89KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDG_3sxEemfSIWqmJMEQA" target="_o3r88KaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o3r89aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o3skAaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o3r89KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDG_3sxEemfSIWqmJMEQA" target="_o3r88KaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o3r89aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3skAaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_-KwGAEvDEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o3r89qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3r896axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o3skAKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3r89qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3r896axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3skAKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o4zXRKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDInHsxEemfSIWqmJMEQA" target="_o4zXQKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o4zXRaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o4zXSaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o4zXRKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDInHsxEemfSIWqmJMEQA" target="_o4zXQKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o4zXRaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4zXSaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_9Zx34EvKEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o4zXRqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o4zXR6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o4zXSKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o4zXRqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4zXR6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4zXSKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o5pExKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDI7HsxEemfSIWqmJMEQA" target="_o5pEwKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o5pExaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o5pEyaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o5pExKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDI7HsxEemfSIWqmJMEQA" target="_o5pEwKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o5pExaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5pEyaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNej-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o5pExqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o5pEx6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o5pEyKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5pExqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5pEx6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5pEyKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o7PnRKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM7VXsxEemfSIWqmJMEQA" target="_o7PnQKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o7PnRaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7PnSaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o7PnRKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM7VXsxEemfSIWqmJMEQA" target="_o7PnQKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o7PnRaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7PnSaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_ayCpID-NEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o7PnRqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7PnR6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7PnSKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o7PnRqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7PnR6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7PnSKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o7Z_VKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDK7HsxEemfSIWqmJMEQA" target="_o7Z_UKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o7Z_VaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7amYKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o7Z_VKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDK7HsxEemfSIWqmJMEQA" target="_o7Z_UKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o7Z_VaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7amYKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_LUh4UEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o7Z_VqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7Z_V6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7Z_WKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o7Z_VqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7Z_V6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7Z_WKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o7vWhKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDLVXsxEemfSIWqmJMEQA" target="_o7vWgKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o7vWhaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o7vWiaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o7vWhKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDLVXsxEemfSIWqmJMEQA" target="_o7vWgKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o7vWhaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o7vWiaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_BB_mUDmkEemDl_QGWIY6yg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o7vWhqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7vWh6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o7vWiKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o7vWhqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7vWh6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7vWiKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o8j15KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDNg3sxEemfSIWqmJMEQA" target="_o8j14KaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o8j15aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o8j16aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o8j15KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDNg3sxEemfSIWqmJMEQA" target="_o8j14KaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o8j15aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o8j16aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_rjMYMEvHEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o8j15qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o8j156axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o8j16KaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o8j15qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o8j156axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o8j16KaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o9KS0aaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDOX3sxEemfSIWqmJMEQA" target="_o9JrwKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o9KS0qaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9KS1qaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o9KS0aaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDOX3sxEemfSIWqmJMEQA" target="_o9JrwKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o9KS0qaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9KS1qaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="TapiEquipment.uml#_BQiK0FogEemu443YKSGnxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o9KS06axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9KS1KaxEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9KS1aaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9KS06axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9KS1KaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9KS1aaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o9XHIaaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDOg3sxEemfSIWqmJMEQA" target="_o9WgEKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o9XHIqaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o9XHJqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o9XHIaaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDOg3sxEemfSIWqmJMEQA" target="_o9WgEKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o9XHIqaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o9XHJqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_MSjC8EvLEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o9XHI6axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9XHJKaxEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o9XHJaaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o9XHI6axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9XHJKaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o9XHJaaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o-QfA6axEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDO3nsxEemfSIWqmJMEQA" target="_o-P38KaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o-QfBKaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o-QfCKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o-QfA6axEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeDO3nsxEemfSIWqmJMEQA" target="_o-P38KaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o-QfBKaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o-QfCKaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiEquipment.uml#_8SXNjj-HEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o-QfBaaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o-QfBqaxEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o-QfB6axEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o-QfBaaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o-QfBqaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o-QfB6axEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o_FldKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM8MXsxEemfSIWqmJMEQA" target="_o_FlcKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o_FldaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_FleaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o_FldKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM8MXsxEemfSIWqmJMEQA" target="_o_FlcKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o_FldaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_FleaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiEquipment.uml#_X1qQMD-QEeaRI-H69PghuA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o_FldqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_Fld6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_FleKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o_FldqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_Fld6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_FleKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_o_U2BKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM3eXsxEemfSIWqmJMEQA" target="_o_U2AKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_o_U2BaaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_o_U2CaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o_U2BKaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM3eXsxEemfSIWqmJMEQA" target="_o_U2AKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o_U2BaaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o_U2CaaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_jqSYYEqtEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_o_U2BqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_U2B6axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_o_U2CKaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o_U2BqaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_U2B6axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o_U2CKaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_pAFD8aaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM4lXsxEemfSIWqmJMEQA" target="_pAEc4KaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_pAFD8qaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAFD9qaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_pAFD8aaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM4lXsxEemfSIWqmJMEQA" target="_pAEc4KaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pAFD8qaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pAFD9qaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_7n4rMEvEEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_pAFD86axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAFD9KaxEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAFD9aaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pAFD86axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pAFD9KaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pAFD9aaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_pAhv5KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM5bHsxEemfSIWqmJMEQA" target="_pAhv4KaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_pAhv5aaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pAhv6aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_pAhv5KaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_UeM5bHsxEemfSIWqmJMEQA" target="_pAhv4KaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pAhv5aaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pAhv6aaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_5CPsYEvJEemT5f_Ewhfs6A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_pAhv5qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAhv56axEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pAhv6KaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pAhv5qaxEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pAhv56axEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pAhv6KaxEeqJcvXkREZ1XQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_pBKpEaaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GLtMoHh7EeqVN_GB3rPx7g" target="_pBKCAKaxEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_pBKpEqaxEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_pBKpFqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_pBKpEaaxEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GLtMoHh7EeqVN_GB3rPx7g" target="_pBKCAKaxEeqJcvXkREZ1XQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pBKpEqaxEeqJcvXkREZ1XQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pBKpFqaxEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="TapiEquipment.uml#_350koG20Eeqjr-4srHPKHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_pBKpE6axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pBKpFKaxEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pBKpFaaxEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pBKpE6axEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pBKpFKaxEeqJcvXkREZ1XQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pBKpFaaxEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/UML/TapiPhotonicMedia.notation b/UML/TapiPhotonicMedia.notation
index bbd22a2d..777fbe80 100644
--- a/UML/TapiPhotonicMedia.notation
+++ b/UML/TapiPhotonicMedia.notation
@@ -601,133 +601,133 @@
       <element href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CYa9IaGMEeqPrpdMOOTlbQ" x="1382" y="882"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vUzVkKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vUzVkaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vUzVk6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HQyqMKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HQyqMatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HQzRQKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vUzVkqWZEeqJcvXkREZ1XQ" x="580" y="40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HQyqMqtkEeqiJu55eR3W2w" x="580" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vVTE0KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vVTE0aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVTE06WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HRP9MKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HRP9MatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRQkQKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vVTE0qWZEeqJcvXkREZ1XQ" x="480" y="440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HRP9MqtkEeqiJu55eR3W2w" x="480" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vVkKkKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vVkKkaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVkKk6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HRf00KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HRf00atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRf006tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vVkKkqWZEeqJcvXkREZ1XQ" x="680" y="440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HRf00qtkEeqiJu55eR3W2w" x="680" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vVzbIKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vVzbIaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVzbI6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HRyIsKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HRyIsatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRyIs6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vVzbIqWZEeqJcvXkREZ1XQ" x="1000" y="440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HRyIsqtkEeqiJu55eR3W2w" x="1000" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vWCEoKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vWCEoaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWCEo6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HSDOcKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HSDOcatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSDOc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vWCEoqWZEeqJcvXkREZ1XQ" x="1160" y="240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HSDOcqtkEeqiJu55eR3W2w" x="1160" y="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vWbtQKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vWbtQaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWbtQ6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HSZzwKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HSZzwatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSZzw6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vWbtQqWZEeqJcvXkREZ1XQ" x="240" y="780"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HSZzwqtkEeqiJu55eR3W2w" x="240" y="780"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vWqWwKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vWqWwaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWqWw6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HSmoEKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HSmoEatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSmoE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vWqWwqWZEeqJcvXkREZ1XQ" x="1020" y="40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HSmoEqtkEeqiJu55eR3W2w" x="1020" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vXNJUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vXNJUaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXNJU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HTZ5UKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HTZ5UatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTZ5U6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vXNJUqWZEeqJcvXkREZ1XQ" x="1420" y="420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HTZ5UqtkEeqiJu55eR3W2w" x="1420" y="420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vXgrUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vXgrUaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXgrU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HTrmIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HTrmIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTrmI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vXgrUqWZEeqJcvXkREZ1XQ" x="720" y="740"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HTrmIqtkEeqiJu55eR3W2w" x="720" y="740"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vXzmQKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vXzmQaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXzmQ6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HT5okKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HT5okatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HT5ok6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vXzmQqWZEeqJcvXkREZ1XQ" x="252" y="34"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HT5okqtkEeqiJu55eR3W2w" x="252" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vYC20KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vYC20aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYC206WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HUISEKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HUISEatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUISE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vYC20qWZEeqJcvXkREZ1XQ" x="240" y="280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUISEqtkEeqiJu55eR3W2w" x="240" y="280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vYimEKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vYimEaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYimE6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HUcbIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HUcbIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUcbI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vYimEqWZEeqJcvXkREZ1XQ" x="240" y="180"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUcbIqtkEeqiJu55eR3W2w" x="240" y="180"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vY3WMKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vY3WMaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vY3WM6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HUnaQKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HUnaQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUnaQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vY3WMqWZEeqJcvXkREZ1XQ" x="880" y="720"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUnaQqtkEeqiJu55eR3W2w" x="880" y="720"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vZMGUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vZMGUaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZMGU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HU1csKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HU1csatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HU1cs6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vZMGUqWZEeqJcvXkREZ1XQ" x="1260" y="823"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HU1csqtkEeqiJu55eR3W2w" x="1260" y="823"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vZjSsKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vZjSsaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZjSs6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HVDfIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HVDfIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVDfI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vZjSsqWZEeqJcvXkREZ1XQ" x="520" y="240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HVDfIqtkEeqiJu55eR3W2w" x="520" y="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vaNaAKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vaNaAaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vaNaA6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HVb5oKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HVb5oatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVb5o6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vaNaAqWZEeqJcvXkREZ1XQ" x="920" y="940"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HVb5oqtkEeqiJu55eR3W2w" x="920" y="940"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_w3tFAY6QEeeyZasfnNSonw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_w3tFAo6QEeeyZasfnNSonw"/>
@@ -758,165 +758,165 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMIoJEeivCevppATXng" id="(0.5741626794258373,0.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMYoJEeivCevppATXng" id="(0.5242718446601942,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vUzVlKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xnJk8I6QEeeyZasfnNSonw" target="_vUzVkKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vUzVlaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vUz8oaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HQzRQatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xnJk8I6QEeeyZasfnNSonw" target="_HQyqMKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HQzRQqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HQzRRqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vUzVlqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vUzVl6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vUz8oKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HQzRQ6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HQzRRKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HQzRRatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vVTE1KWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BsudMI6YEeeyZasfnNSonw" target="_vVTE0KWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vVTE1aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVTE2aWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HRQkQatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BsudMI6YEeeyZasfnNSonw" target="_HRP9MKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HRQkQqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRQkRqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vVTE1qWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVTE16WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVTE2KWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HRQkQ6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRQkRKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRQkRatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vVkKlKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GaDH8I6YEeeyZasfnNSonw" target="_vVkKkKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vVkKlaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVkKmaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HRf01KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_GaDH8I6YEeeyZasfnNSonw" target="_HRf00KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HRf01atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRf02atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vVkKlqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVkKl6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVkKmKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HRf01qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRf016tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRf02KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vVzbJKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_I9O2YI6YEeeyZasfnNSonw" target="_vVzbIKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vVzbJaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vVzbKaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HRyItKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_I9O2YI6YEeeyZasfnNSonw" target="_HRyIsKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HRyItatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRyIuatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vVzbJqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVzbJ6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vVzbKKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HRyItqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRyIt6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRyIuKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vWCEpKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Lm61cI6YEeeyZasfnNSonw" target="_vWCEoKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vWCEpaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWCrsqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HSDOdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Lm61cI6YEeeyZasfnNSonw" target="_HSDOcKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HSDOdatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSD1gqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vWCEpqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWCrsKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWCrsaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HSDOdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSD1gKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSD1gatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vWcUUKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xu7CoI8ZEeedErNofqJXiw" target="_vWbtQKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vWcUUaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWcUVaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HSZzxKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xu7CoI8ZEeedErNofqJXiw" target="_HSZzwKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HSZzxatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSZzyatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vWcUUqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWcUU6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWcUVKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HSZzxqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSZzx6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSZzyKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vWqWxKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_wB7jIXPYEeiPPoPDo3q5jA" target="_vWqWwKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vWqWxaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vWqWyaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HSmoFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_wB7jIXPYEeiPPoPDo3q5jA" target="_HSmoEKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HSmoFatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSmoGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vWqWxqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWqWx6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vWqWyKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HSmoFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSmoF6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSmoGKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vXNJVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__ZU_8XkzEeiO-c_khjKlFQ" target="_vXNJUKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vXNJVaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXNJWaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HTZ5VKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__ZU_8XkzEeiO-c_khjKlFQ" target="_HTZ5UKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HTZ5VatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTZ5WatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vXNJVqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXNJV6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXNJWKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HTZ5VqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTZ5V6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTZ5WKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vXgrVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_3YLeMHpKEei5LIrjJTgegQ" target="_vXgrUKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vXgrVaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXhSYqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HTrmJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3YLeMHpKEei5LIrjJTgegQ" target="_HTrmIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HTrmJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTrmKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vXgrVqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXhSYKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXhSYaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HTrmJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTrmJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTrmKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vXzmRKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_DY-LUIoJEeivCevppATXng" target="_vXzmQKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vXzmRaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vXzmSaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HT5olKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DY-LUIoJEeivCevppATXng" target="_HT5okKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HT5olatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HT5omatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vXzmRqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXzmR6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vXzmSKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HT5olqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HT5ol6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HT5omKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vYC21KWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Er39oIoJEeivCevppATXng" target="_vYC20KWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vYC21aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYDd4qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HUISFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Er39oIoJEeivCevppATXng" target="_HUISEKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HUISFatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUISGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vYC21qWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYDd4KWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYDd4aWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HUISFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUISF6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUISGKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vYimFKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_LhPS8YoJEeivCevppATXng" target="_vYimEKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vYimFaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vYjNIqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HUcbJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_LhPS8YoJEeivCevppATXng" target="_HUcbIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HUcbJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUcbKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vYimFqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYjNIKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vYjNIaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HUcbJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUcbJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUcbKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vY3WNKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EMsiYLqdEeimKvjOEffRIA" target="_vY3WMKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vY3WNaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vY3WOaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HUnaRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EMsiYLqdEeimKvjOEffRIA" target="_HUnaQKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HUnaRatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUnaSatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vY3WNqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vY3WN6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vY3WOKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HUnaRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUnaR6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUnaSKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vZMGVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lnxLALqdEeimKvjOEffRIA" target="_vZMGUKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vZMtYKWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZMtZKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HU1ctKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lnxLALqdEeimKvjOEffRIA" target="_HU1csKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HU1ctatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HU1cuatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vZMtYaWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZMtYqWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZMtY6WZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HU1ctqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HU1ct6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HU1cuKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vZjStKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_nCyqQMG-EeiAg83ctgK3eQ" target="_vZjSsKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vZjStaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vZj5wqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HVDfJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_nCyqQMG-EeiAg83ctgK3eQ" target="_HVDfIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HVDfJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVDfKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vZjStqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZj5wKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vZj5waWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HVDfJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVDfJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVDfKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_vaNaBKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_KXjRAG9yEeqLWtFsc04LIg" target="_vaNaAKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_vaNaBaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vaNaCaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HVb5pKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_KXjRAG9yEeqLWtFsc04LIg" target="_HVb5oKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HVb5patkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVb5qatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_vaNaBqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vaNaB6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vaNaCKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HVb5pqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVb5p6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVb5qKtkEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_gKM6AI6dEeeyZasfnNSonw" type="layersTree" name="Layers Tree Editor"/>
@@ -1022,13 +1022,13 @@
         </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4rH_DHjAEeixydPRZ8lIKA" x="-259" y="-447" width="159" height="62"/>
       </children>
-      <children xsi:type="notation:Shape" xmi:id="_7mMU4KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_7mMU4aV8EeqJcvXkREZ1XQ"/>
-        <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7mM78KV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+      <children xsi:type="notation:Shape" xmi:id="_ICksc6tkEeqiJu55eR3W2w" type="StereotypeComment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_ICksdKtkEeqiJu55eR3W2w"/>
+        <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICksdqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
           <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
         </styles>
         <element xsi:nil="true"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7mMU4qV8EeqJcvXkREZ1XQ" x="-59" y="-447"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ICksdatkEeqiJu55eR3W2w" x="-59" y="-447"/>
       </children>
       <element href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-8QyEXiGEeiPPoPDo3q5jA" x="-280" y="-456" width="721" height="62"/>
@@ -1272,6 +1272,14 @@
           <element href="TapiPhotonicMedia.uml#_JfEZ0LTdEeiF8sBzK2t1Sw"/>
           <layoutConstraint xsi:type="notation:Location" xmi:id="_TleUo8MsEei3gLXE4_XcoA"/>
         </children>
+        <children xsi:type="notation:Shape" xmi:id="_UUePAKt8EeqiJu55eR3W2w" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UUePAat8EeqiJu55eR3W2w"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UUfdIKt8EeqiJu55eR3W2w" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UUfdIat8EeqiJu55eR3W2w"/>
+        </children>
         <styles xsi:type="notation:TitleStyle" xmi:id="_XVoZVHk6EeiO-c_khjKlFQ"/>
         <styles xsi:type="notation:SortingStyle" xmi:id="_XVoZVXk6EeiO-c_khjKlFQ"/>
         <styles xsi:type="notation:FilteringStyle" xmi:id="_XVoZVnk6EeiO-c_khjKlFQ"/>
@@ -1290,7 +1298,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XVoZYXk6EeiO-c_khjKlFQ"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XVnyQXk6EeiO-c_khjKlFQ" x="509" y="34" width="441" height="261"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XVnyQXk6EeiO-c_khjKlFQ" x="509" y="34" width="441" height="319"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_s3mNEJmTEeiOmuqNbykpsw" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_s3sTsJmTEeiOmuqNbykpsw" type="Class_NameLabel"/>
@@ -1366,6 +1374,18 @@
           <element href="TapiPhotonicMedia.uml#_i18IoJmYEeiOmuqNbykpsw"/>
           <layoutConstraint xsi:type="notation:Location" xmi:id="_jpxZUZmYEeiOmuqNbykpsw"/>
         </children>
+        <children xsi:type="notation:Shape" xmi:id="_UUfdIqt8EeqiJu55eR3W2w" type="Property_ClassAttributeLabel">
+          <element href="TapiPhotonicMedia.uml#_kDTKsKE8EeqPrpdMOOTlbQ"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UUfdI6t8EeqiJu55eR3W2w"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UUfdJKt8EeqiJu55eR3W2w" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UUfdJat8EeqiJu55eR3W2w"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_UUfdJqt8EeqiJu55eR3W2w" type="Property_ClassAttributeLabel">
+          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xsi:type="notation:Location" xmi:id="_UUfdJ6t8EeqiJu55eR3W2w"/>
+        </children>
         <styles xsi:type="notation:TitleStyle" xmi:id="_aw4GBpmYEeiOmuqNbykpsw"/>
         <styles xsi:type="notation:SortingStyle" xmi:id="_aw4GB5mYEeiOmuqNbykpsw"/>
         <styles xsi:type="notation:FilteringStyle" xmi:id="_aw4GCJmYEeiOmuqNbykpsw"/>
@@ -1384,7 +1404,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aw4GE5mYEeiOmuqNbykpsw"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aw4GAZmYEeiOmuqNbykpsw" x="1363" y="103" width="320" height="121"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aw4GAZmYEeiOmuqNbykpsw" x="1137" y="120" width="570" height="159"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_MlzdkJs8EeikSLSDi2qpXA" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_Mlzdkps8EeikSLSDi2qpXA" type="Class_NameLabel"/>
@@ -1418,7 +1438,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Mlzdo5s8EeikSLSDi2qpXA"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MlzdkZs8EeikSLSDi2qpXA" x="506" y="402" height="141"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MlzdkZs8EeikSLSDi2qpXA" x="509" y="459" width="323" height="141"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_gP2P0Lq4EeimKvjOEffRIA" type="Class_Shape">
       <eAnnotations xmi:id="_it2GUMDZEeiXyMZOD9tv6w" source="PapyrusCSSForceValue">
@@ -1522,7 +1542,7 @@
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hZOHz29wEeqLWtFsc04LIg"/>
       </children>
       <element href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hZNgsW9wEeqLWtFsc04LIg" x="1160" y="439" width="508" height="148"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hZNgsW9wEeqLWtFsc04LIg" x="1065" y="442" width="508" height="148"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_YH1UkG9zEeqLWtFsc04LIg" type="Class_Shape">
       <children xsi:type="notation:DecorationNode" xmi:id="_YH17oG9zEeqLWtFsc04LIg" type="Class_NameLabel"/>
@@ -1638,363 +1658,277 @@
       <element href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pqbkkaE3EeqPrpdMOOTlbQ" x="1233" y="-287" height="116"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LywX8KE8EeqPrpdMOOTlbQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_LywX8qE8EeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_LytUoKE8EeqPrpdMOOTlbQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LywX8aE8EeqPrpdMOOTlbQ" x="1134" y="345" width="166" height="41"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__woNYKE8EeqPrpdMOOTlbQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="__wo0cKE8EeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#__wm_QKE8EeqPrpdMOOTlbQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__woNYaE8EeqPrpdMOOTlbQ" x="1299" y="333" width="283"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_4vLc4KGJEeqPrpdMOOTlbQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_4vLc4qGJEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_4vKOwKGJEeqPrpdMOOTlbQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4vLc4aGJEeqPrpdMOOTlbQ" x="839" y="37" height="36"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Ee_6AKGKEeqPrpdMOOTlbQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_EfAhEKGKEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_Ee-r4KGKEeqPrpdMOOTlbQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ee_6AaGKEeqPrpdMOOTlbQ" x="1679" y="82" width="212"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_KvZHwKGPEeqPrpdMOOTlbQ" type="DataType_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvZHwqGPEeqPrpdMOOTlbQ" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvZHw6GPEeqPrpdMOOTlbQ" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvZHxKGPEeqPrpdMOOTlbQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_KvZHxaGPEeqPrpdMOOTlbQ" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_QdcPsKGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiCommon.uml#_rNbewr1-EeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QdcPsaGPEeqPrpdMOOTlbQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_QdcPsqGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiCommon.uml#_l9HQoFtUEeexvMtO2oNM9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QdcPs6GPEeqPrpdMOOTlbQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_KvZHxqGPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_KvZHx6GPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_KvZHyKGPEeqPrpdMOOTlbQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KvZHyaGPEeqPrpdMOOTlbQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_KvZu0KGPEeqPrpdMOOTlbQ" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_KvZu0aGPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_KvZu0qGPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_KvZu06GPEeqPrpdMOOTlbQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KvZu1KGPEeqPrpdMOOTlbQ"/>
-      </children>
-      <element href="TapiCommon.uml#_rNbewL1-EeWdore3Cxez9g"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_KvZHwaGPEeqPrpdMOOTlbQ" x="1738" y="-68" height="118"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_LwjCwKGPEeqPrpdMOOTlbQ" type="DataType_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_LwjCwqGPEeqPrpdMOOTlbQ" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LwjCw6GPEeqPrpdMOOTlbQ" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LwjCxKGPEeqPrpdMOOTlbQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LwjCxaGPEeqPrpdMOOTlbQ" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_RyJ_4KGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiCommon.uml#_YCsGgFs7EeexvMtO2oNM9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_RyJ_4aGPEeqPrpdMOOTlbQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_RyKm8KGPEeqPrpdMOOTlbQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiCommon.uml#_axM7MFs7EeexvMtO2oNM9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_RyKm8aGPEeqPrpdMOOTlbQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LwjCxqGPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LwjCx6GPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LwjCyKGPEeqPrpdMOOTlbQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LwjCyaGPEeqPrpdMOOTlbQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LwjCyqGPEeqPrpdMOOTlbQ" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LwjCy6GPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LwjCzKGPEeqPrpdMOOTlbQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LwjCzaGPEeqPrpdMOOTlbQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LwjCzqGPEeqPrpdMOOTlbQ"/>
-      </children>
-      <element href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LwjCwaGPEeqPrpdMOOTlbQ" x="1738" y="-211" height="123"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_NEwnMKGQEeqPrpdMOOTlbQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_NEwnMqGQEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_NEvZEKGQEeqPrpdMOOTlbQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NEwnMaGQEeqPrpdMOOTlbQ" x="1654" y="-303"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_dn2HkKGnEeqPrpdMOOTlbQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_dn2uoKGnEeqPrpdMOOTlbQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_dn05cKGnEeqPrpdMOOTlbQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dn2HkaGnEeqPrpdMOOTlbQ" x="1651" y="-412"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_7liNkKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7liNkaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7li0oKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ICWqAKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ICWqAatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICWqA6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7liNkqV8EeqJcvXkREZ1XQ" x="-80" y="-456"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ICWqAqtkEeqiJu55eR3W2w" x="-80" y="-456"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7oA50KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7oA50aV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7oA506V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IDX9sKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IDX9satkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IDX9s6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7oA50qV8EeqJcvXkREZ1XQ" x="-96" y="-306"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IDX9sqtkEeqiJu55eR3W2w" x="-96" y="-306"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7pNzsKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7pNzsaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pNzs6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ID6wQKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ID6wQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ID7XUKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7pNzsqV8EeqJcvXkREZ1XQ" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ID6wQqtkEeqiJu55eR3W2w" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7pcdMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7pcdMaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pcdM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IEBd8KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IEBd8atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEBd86tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7pcdMqV8EeqJcvXkREZ1XQ" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEBd8qtkEeqiJu55eR3W2w" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7pv_MKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7pv_MaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pv_M6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IEKA0KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IEKA0atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEKA06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7pv_MqV8EeqJcvXkREZ1XQ" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEKA0qtkEeqiJu55eR3W2w" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7q3ZgKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7q3ZgaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7q3Zg6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IEuokKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IEuokatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEuok6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7q3ZgqV8EeqJcvXkREZ1XQ" x="-100" y="297"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEuokqtkEeqiJu55eR3W2w" x="-100" y="297"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7s2WgKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7s2WgaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7s2Wg6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IFk9IKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IFk9IatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IFk9I6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7s2WgqV8EeqJcvXkREZ1XQ" x="-100" y="197"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IFk9IqtkEeqiJu55eR3W2w" x="-100" y="197"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7tkIMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7tkIMaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7tkIM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IGEFUKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IGEFUatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IGEFU6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7tkIMqV8EeqJcvXkREZ1XQ" x="908" y="-460"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IGEFUqtkEeqiJu55eR3W2w" x="908" y="-460"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7vZUMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7vZUMaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7vZ7QKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IHPKAKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IHPKAatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IHPKA6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7vZUMqV8EeqJcvXkREZ1XQ" x="708" y="-171"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IHPKAqtkEeqiJu55eR3W2w" x="708" y="-171"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7wgugKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7wgugaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wgug6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IH7tkKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IH7tkatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IH8UoKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7wgugqV8EeqJcvXkREZ1XQ" x="708" y="-271"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IH7tkqtkEeqiJu55eR3W2w" x="708" y="-271"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7wpRYKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7wpRYaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wpRY6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IICbQKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IICbQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IICbQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7wpRYqV8EeqJcvXkREZ1XQ" x="708" y="-271"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IICbQqtkEeqiJu55eR3W2w" x="708" y="-271"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7xp-AKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7xp-AaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7xp-A6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IIlN0KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IIlN0atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IIlN06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7xp-AqV8EeqJcvXkREZ1XQ" x="309" y="115"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IIlN0qtkEeqiJu55eR3W2w" x="309" y="115"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7ztMcKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7ztMcaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7ztzgKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IJmhgKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IJmhgatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IJmhg6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7ztMcqV8EeqJcvXkREZ1XQ" x="709" y="34"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IJmhgqtkEeqiJu55eR3W2w" x="709" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_71ulsKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_71ulsaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_71uls6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IKrfkKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IKrfkatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IKsGoKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_71ulsqV8EeqJcvXkREZ1XQ" x="709" y="-66"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IKrfkqtkEeqiJu55eR3W2w" x="709" y="-66"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_72tdIKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_72tdIaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_72tdI6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ILRVcKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ILRVcatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILRVc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_72tdIqV8EeqJcvXkREZ1XQ" x="260" y="-300"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ILRVcqtkEeqiJu55eR3W2w" x="260" y="-300"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_73guYKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_73guYaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_73guY6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ILwdoKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ILwdoatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILwdo6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_73guYqV8EeqJcvXkREZ1XQ" x="260" y="-400"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ILwdoqtkEeqiJu55eR3W2w" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_738zQKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_738zQaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_738zQ6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IL5nkKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IL5nkatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IL5nk6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_738zQqV8EeqJcvXkREZ1XQ" x="260" y="-400"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IL5nkqtkEeqiJu55eR3W2w" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_74JnkKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_74JnkaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_74Jnk6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IMAVQKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IMAVQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IMAVQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_74JnkqV8EeqJcvXkREZ1XQ" x="260" y="-400"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IMAVQqtkEeqiJu55eR3W2w" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_75nnMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_75nnMaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_75nnM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IM2CwKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IM2CwatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IM2p0atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_75nnMqV8EeqJcvXkREZ1XQ" x="1288" y="-129"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IM2p0KtkEeqiJu55eR3W2w" x="1288" y="-129"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_76r-MKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_76r-MaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_76r-M6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_INs-YKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_INs-YatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_INs-Y6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_76r-MqV8EeqJcvXkREZ1XQ" x="1288" y="-229"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_INs-YqtkEeqiJu55eR3W2w" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_766nsKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_766nsaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_766ns6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IN0TIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IN0TIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN0TI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_766nsqV8EeqJcvXkREZ1XQ" x="1288" y="-229"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IN0TIqtkEeqiJu55eR3W2w" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_77G08KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_77G08aV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_77G086V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IN7n4KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IN7n4atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN8O8KtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_77G08qV8EeqJcvXkREZ1XQ" x="1288" y="-229"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IN7n4qtkEeqiJu55eR3W2w" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_777UUKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_777UUaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_777UU6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IOir4KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IOir4atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IOir46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_777UUqV8EeqJcvXkREZ1XQ" x="1563" y="103"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IOir4qtkEeqiJu55eR3W2w" x="1563" y="103"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_78k0kKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_78k0kaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_78k0k6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IPDpQKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IPDpQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPDpQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_78k0kqV8EeqJcvXkREZ1XQ" x="1563" y="3"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IPDpQqtkEeqiJu55eR3W2w" x="1563" y="3"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_79fakKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_79fakaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_79fak6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IPo4EKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IPo4EatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPo4E6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_79fakqV8EeqJcvXkREZ1XQ" x="706" y="402"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IPo4EqtkEeqiJu55eR3W2w" x="706" y="402"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7_BroKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7_BroaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7_Bro6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IQvEQKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IQvEQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IQvrUKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7_BroqV8EeqJcvXkREZ1XQ" x="-101" y="601"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IQvEQqtkEeqiJu55eR3W2w" x="-101" y="601"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8A8XMKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8A8XMaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8A8XM6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ISJZgKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ISJZgatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ISJZg6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8A8XMqV8EeqJcvXkREZ1XQ" x="1360" y="439"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ISJZgqtkEeqiJu55eR3W2w" x="1360" y="439"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8CMUYKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8CMUYaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8CM7cKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IS944KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IS944atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IS9446tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8CMUYqV8EeqJcvXkREZ1XQ" x="20" y="-77"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IS944qtkEeqiJu55eR3W2w" x="20" y="-77"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8D6LoKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8D6LoaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8D6Lo6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ITwjEKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ITwjEatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ITwjE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8D6LoqV8EeqJcvXkREZ1XQ" x="960" y="-282"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ITwjEqtkEeqiJu55eR3W2w" x="960" y="-282"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8ElhEKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8ElhEaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8EmIIKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IUJkoKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IUJkoatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUJko6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8ElhEqV8EeqJcvXkREZ1XQ" x="960" y="-382"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IUJkoqtkEeqiJu55eR3W2w" x="960" y="-382"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8ExHQKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8ExHQaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8ExHQ6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IUQ5YKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IUQ5YatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUQ5Y6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8ExHQqV8EeqJcvXkREZ1XQ" x="960" y="-382"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IUQ5YqtkEeqiJu55eR3W2w" x="960" y="-382"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8FWWEKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8FWWEaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8FWWE6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IUqiAKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IUqiAatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUqiA6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8FWWEqV8EeqJcvXkREZ1XQ" x="1433" y="-287"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IUqiAqtkEeqiJu55eR3W2w" x="1433" y="-287"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8GHyIKV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8GHyIaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GHyI6V8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IVHN8KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IVHN8atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVH1AKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8GHyIqV8EeqJcvXkREZ1XQ" x="1433" y="-387"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IVHN8qtkEeqiJu55eR3W2w" x="1433" y="-387"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_8GPt8KV8EeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_8GPt8aV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GQVAKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_IVNUkKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_IVNUkatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVN7oKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_8GPt8qV8EeqJcvXkREZ1XQ" x="1433" y="-387"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IVNUkqtkEeqiJu55eR3W2w" x="1433" y="-387"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_z6FlAY6dEeeyZasfnNSonw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_z6FlAo6dEeeyZasfnNSonw"/>
@@ -2159,17 +2093,17 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_nZqyiJmYEeiOmuqNbykpsw" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_w5T8wJmYEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqyiZmYEeiOmuqNbykpsw" x="8" y="20"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqyiZmYEeiOmuqNbykpsw" x="14" y="22"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_nZqyipmYEeiOmuqNbykpsw" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_w8E84JmYEeiOmuqNbykpsw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqyi5mYEeiOmuqNbykpsw" x="-10" y="22"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_nZqyi5mYEeiOmuqNbykpsw" x="-16" y="29"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_nZkr4ZmYEeiOmuqNbykpsw"/>
       <element href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nZkr4pmYEeiOmuqNbykpsw" points="[1416, -4, -643984, -643984]$[1416, 53, -643984, -643984]$[1411, 53, -643984, -643984]$[1411, 103, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoJmYEeiOmuqNbykpsw" id="(0.5959409594095941,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoZmYEeiOmuqNbykpsw" id="(0.15,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_nZkr4pmYEeiOmuqNbykpsw" points="[1396, -4, -643984, -643984]$[1396, 120, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoJmYEeiOmuqNbykpsw" id="(0.5701107011070111,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nffGoZmYEeiOmuqNbykpsw" id="(0.45614035087719296,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_ObaTQJmaEeiOmuqNbykpsw" type="Abstraction_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_ObaTQ5maEeiOmuqNbykpsw" type="Abstraction_NameLabel">
@@ -2193,7 +2127,7 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyRZs8EeikSLSDi2qpXA" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VYVDIJs8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyRps8EeikSLSDi2qpXA" x="-12" y="-18"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyRps8EeikSLSDi2qpXA" x="-7" y="-136"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyR5s8EeikSLSDi2qpXA" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Va8SQJs8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2205,17 +2139,17 @@
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyS5s8EeikSLSDi2qpXA" type="Association_SourceMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Vg-BwJs8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyTJs8EeikSLSDi2qpXA" x="10" y="17"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyTJs8EeikSLSDi2qpXA" x="10" y="24"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_OBTyTZs8EeikSLSDi2qpXA" type="Association_TargetMultiplicityLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VjWnYJs8EeikSLSDi2qpXA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyTps8EeikSLSDi2qpXA" x="-18" y="16"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_OBTyTps8EeikSLSDi2qpXA" x="-16" y="27"/>
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_OBTyQZs8EeikSLSDi2qpXA"/>
       <element href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_OBTyQps8EeikSLSDi2qpXA" points="[654, 276, -643984, -643984]$[654, 339, -643984, -643984]$[649, 339, -643984, -643984]$[649, 402, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AJs8EeikSLSDi2qpXA" id="(0.31746031746031744,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AZs8EeikSLSDi2qpXA" id="(0.4831081081081081,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_OBTyQps8EeikSLSDi2qpXA" points="[646, 353, -643984, -643984]$[646, 459, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AJs8EeikSLSDi2qpXA" id="(0.31519274376417233,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OIv3AZs8EeikSLSDi2qpXA" id="(0.43034055727554177,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_eVdssLs6Eeiljfl0umr-iQ" type="Association_Edge" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_gP2P0Lq4EeimKvjOEffRIA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_eVjzULs6Eeiljfl0umr-iQ" type="Association_StereotypeLabel">
@@ -2282,11 +2216,11 @@
     <edges xsi:type="notation:Connector" xmi:id="_1zohAG9xEeqLWtFsc04LIg" type="Association_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpIEG9xEeqLWtFsc04LIg" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2GwX0KE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIEW9xEeqLWtFsc04LIg" x="49" y="16"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIEW9xEeqLWtFsc04LIg" x="155" y="-87"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpIEm9xEeqLWtFsc04LIg" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2NFCQKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIE29xEeqLWtFsc04LIg" x="24" y="5"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIE29xEeqLWtFsc04LIg" x="125" y="-57"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1zpIFG9xEeqLWtFsc04LIg" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2UFCIKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2306,9 +2240,9 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_1zohAW9xEeqLWtFsc04LIg"/>
       <element href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1zohAm9xEeqLWtFsc04LIg" points="[1175, -4, -643984, -643984]$[1175, 403, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYG9xEeqLWtFsc04LIg" id="(0.15867158671586715,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYW9xEeqLWtFsc04LIg" id="(0.027559055118110236,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1zohAm9xEeqLWtFsc04LIg" points="[1101, -4, -643984, -643984]$[1101, 442, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYG9xEeqLWtFsc04LIg" id="(0.027675276752767528,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYW9xEeqLWtFsc04LIg" id="(0.07480314960629922,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_7O7aIG9zEeqLWtFsc04LIg" type="Association_Edge" source="_s3mNEJmTEeiOmuqNbykpsw" target="_YH1UkG9zEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BMG9zEeqLWtFsc04LIg" type="Association_StereotypeLabel">
@@ -2460,18 +2394,18 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_1ei2YaE4EeqPrpdMOOTlbQ"/>
       <element href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1ei2YqE4EeqPrpdMOOTlbQ" points="[1638, -183, -643984, -643984]$[1638, -49, -643984, -643984]$[1642, -49, -643984, -643984]$[1642, 103, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEKE4EeqPrpdMOOTlbQ" id="(0.9831730769230769,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEaE4EeqPrpdMOOTlbQ" id="(0.871875,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1ei2YqE4EeqPrpdMOOTlbQ" points="[1642, -171, -643984, -643984]$[1642, 120, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEKE4EeqPrpdMOOTlbQ" id="(0.9783653846153846,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEaE4EeqPrpdMOOTlbQ" id="(0.8824561403508772,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_kK61oKE8EeqPrpdMOOTlbQ" type="Association_Edge" source="_aw4GAJmYEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_kK61o6E8EeqPrpdMOOTlbQ" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wfgMsKE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK61pKE8EeqPrpdMOOTlbQ" x="-31" y="-80"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK61pKE8EeqPrpdMOOTlbQ" x="8" y="-79"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_kK61paE8EeqPrpdMOOTlbQ" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wnBJ8KE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK61pqE8EeqPrpdMOOTlbQ" x="-55" y="-132"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kK61pqE8EeqPrpdMOOTlbQ" x="-21" y="-137"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_kK7csKE8EeqPrpdMOOTlbQ" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wvja4KE8EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2491,9 +2425,9 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_kK61oaE8EeqPrpdMOOTlbQ"/>
       <element href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kK61oqE8EeqPrpdMOOTlbQ" points="[1443, 224, -643984, -643984]$[1443, 403, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kcUHoKE8EeqPrpdMOOTlbQ" id="(0.25,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kcUusKE8EeqPrpdMOOTlbQ" id="(0.5570866141732284,0.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kK61oqE8EeqPrpdMOOTlbQ" points="[1408, 279, -643984, -643984]$[1408, 442, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kcUHoKE8EeqPrpdMOOTlbQ" id="(0.4789473684210526,1.0)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kcUusKE8EeqPrpdMOOTlbQ" id="(0.6791338582677166,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_IM9d4KGoEeqPrpdMOOTlbQ" type="Association_Edge" source="_7NoX0HjAEeixydPRZ8lIKA" target="_7NoX0HjAEeixydPRZ8lIKA" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_IM-E8KGoEeqPrpdMOOTlbQ" type="Association_StereotypeLabel">
@@ -2526,355 +2460,355 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_KmorAKGoEeqPrpdMOOTlbQ" id="(1.0,0.1791044776119403)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_KmorAaGoEeqPrpdMOOTlbQ" id="(1.0,0.7910447761194029)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7ljbsKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-8QyEHiGEeiPPoPDo3q5jA" target="_7liNkKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7ljbsaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7lkCwKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ICWqBKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_-8QyEHiGEeiPPoPDo3q5jA" target="_ICWqAKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ICWqBatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICXREqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7ljbsqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ljbs6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ljbtKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ICWqBqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICXREKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICXREatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7mM78aV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_4rH-0HjAEeixydPRZ8lIKA" target="_7mMU4KV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7mM78qV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7mM79qV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ICksd6tkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_4rH-0HjAEeixydPRZ8lIKA" target="_ICksc6tkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ICkseKtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICksfKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7mM786V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7mM79KV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7mM79aV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ICkseatkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICkseqtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICkse6tkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7oA51KV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_7oA50KV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7oA51aV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7oA52aV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IDX9tKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_IDX9sKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IDX9tatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IDX9uatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7oA51qV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7oA516V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7oA52KV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IDX9tqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IDX9t6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IDX9uKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7pNztKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Y9rskHiHEeiPPoPDo3q5jA" target="_7pNzsKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7pNztaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pNzuaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ID7XUatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Y9rskHiHEeiPPoPDo3q5jA" target="_ID6wQKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ID7XUqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ID7XVqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7pNztqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pNzt6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pNzuKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ID7XU6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ID7XVKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ID7XVatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7pcdNKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7cWEIIuWEeiu6boZkiJHCA" target="_7pcdMKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7pcdNaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pcdOaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IEBd9KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7cWEIIuWEeiu6boZkiJHCA" target="_IEBd8KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IEBd9atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IECFAKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7pcdNqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pcdN6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pcdOKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEBd9qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEBd96tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEBd-KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7pv_NKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_HBj6sG90EeqLWtFsc04LIg" target="_7pv_MKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7pv_NaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7pwmQKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IEKA1KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_HBj6sG90EeqLWtFsc04LIg" target="_IEKA0KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IEKA1atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEKA2atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7pv_NqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pv_N6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7pv_OKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEKA1qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEKA16tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEKA2KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7q4AkKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_7q3ZgKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7q4AkaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7q4AlaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IEuolKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_IEuokKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IEuolatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEuomatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7q4AkqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7q4Ak6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7q4AlKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEuolqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEuol6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEuomKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7s2WhKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_eVdssLs6Eeiljfl0umr-iQ" target="_7s2WgKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7s2WhaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7s2WiaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IFk9JKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_eVdssLs6Eeiljfl0umr-iQ" target="_IFk9IKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IFk9JatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IFk9KatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7s2WhqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7s2Wh6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7s2WiKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IFk9JqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IFk9J6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IFk9KKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7tkvQKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7NoX0HjAEeixydPRZ8lIKA" target="_7tkIMKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7tkvQaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7tkvRaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IGEFVKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7NoX0HjAEeixydPRZ8lIKA" target="_IGEFUKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IGEFVatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IGEsYKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7tkvQqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7tkvQ6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7tkvRKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IGEFVqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IGEFV6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IGEFWKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7vZ7QaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_7vZUMKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7vZ7QqV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7vZ7RqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IHPKBKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_IHPKAKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IHPKBatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IHPKCatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7vZ7Q6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7vZ7RKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7vZ7RaV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IHPKBqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IHPKB6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IHPKCKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7wguhKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Xq0xwHkwEeiO-c_khjKlFQ" target="_7wgugKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7wguhaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wguiaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IH8UoatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Xq0xwHkwEeiO-c_khjKlFQ" target="_IH7tkKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IH8UoqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IH8UpqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7wguhqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wguh6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wguiKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IH8Uo6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IH8UpKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IH8UpatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7wpRZKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_BDZzQIuXEeiu6boZkiJHCA" target="_7wpRYKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7wpRZaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7wpRaaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IICbRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BDZzQIuXEeiu6boZkiJHCA" target="_IICbQKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IICbRatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IIDCUqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7wpRZqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wpRZ6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7wpRaKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IICbRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIDCUKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIDCUatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7xp-BKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-Be4sHkyEeiO-c_khjKlFQ" target="_7xp-AKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7xp-BaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7xp-CaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IIl04KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_-Be4sHkyEeiO-c_khjKlFQ" target="_IIlN0KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IIl04atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IIl05atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7xp-BqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7xp-B6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7xp-CKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IIl04qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIl046tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIl05KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7ztzgaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_7ztMcKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7ztzgqV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7ztzhqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IJmhhKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_IJmhgKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IJmhhatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IJmhiatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7ztzg6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ztzhKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7ztzhaV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IJmhhqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IJmhh6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IJmhiKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_71ultKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_OBTyQJs8EeikSLSDi2qpXA" target="_71ulsKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_71ultaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_71uluaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IKsGoatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_OBTyQJs8EeikSLSDi2qpXA" target="_IKrfkKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IKsGoqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IKsGpqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_71ultqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_71ult6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_71uluKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IKsGo6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IKsGpKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IKsGpatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_72tdJKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_s3mNEJmTEeiOmuqNbykpsw" target="_72tdIKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_72tdJaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_72tdKaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ILRVdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_s3mNEJmTEeiOmuqNbykpsw" target="_ILRVcKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ILRVdatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILRVeatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_72tdJqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_72tdJ6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_72tdKKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ILRVdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILRVd6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILRVeKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_73guZKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_8V3R4JmTEeiOmuqNbykpsw" target="_73guYKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_73guZaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_73guaaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ILxEsKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_8V3R4JmTEeiOmuqNbykpsw" target="_ILwdoKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ILxEsatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILxEtatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_73guZqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_73guZ6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_73guaKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ILxEsqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILxEs6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILxEtKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_739aUKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_VE_BkJmVEeiOmuqNbykpsw" target="_738zQKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_739aUaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_739aVaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IL5nlKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_VE_BkJmVEeiOmuqNbykpsw" target="_IL5nkKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IL5nlatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IL5nmatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_739aUqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_739aU6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_739aVKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IL5nlqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IL5nl6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IL5nmKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_74JnlKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7O7aIG9zEeqLWtFsc04LIg" target="_74JnkKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_74JnlaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_74KOoqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IMAVRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7O7aIG9zEeqLWtFsc04LIg" target="_IMAVQKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IMAVRatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IMAVSatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_74JnlqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_74KOoKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_74KOoaV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IMAVRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IMAVR6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IMAVSKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_75nnNKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_EtIM4JmWEeiOmuqNbykpsw" target="_75nnMKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_75nnNaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_75nnOaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IM2p0qtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EtIM4JmWEeiOmuqNbykpsw" target="_IM2CwKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IM2p06tkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IM2p16tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_75nnNqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_75nnN6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_75nnOKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IM2p1KtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IM2p1atkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IM2p1qtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_76slQKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_nZkr4JmYEeiOmuqNbykpsw" target="_76r-MKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_76slQaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_76slRaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_INs-ZKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_nZkr4JmYEeiOmuqNbykpsw" target="_INs-YKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_INs-ZatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_INtlcatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_76slQqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_76slQ6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_76slRKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_INs-ZqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_INs-Z6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_INtlcKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_766ntKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ObaTQJmaEeiOmuqNbykpsw" target="_766nsKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_766ntaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_766nuaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IN0TJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ObaTQJmaEeiOmuqNbykpsw" target="_IN0TIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IN0TJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN0TKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_766ntqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_766nt6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_766nuKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IN0TJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN0TJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN0TKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_77G09KV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_1zohAG9xEeqLWtFsc04LIg" target="_77G08KV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_77G09aV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_77G0-aV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IN8O8atkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1zohAG9xEeqLWtFsc04LIg" target="_IN7n4KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IN8O8qtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN8O9qtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_77G09qV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_77G096V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_77G0-KV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IN8O86tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN8O9KtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN8O9atkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_777UVKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_aw4GAJmYEeiOmuqNbykpsw" target="_777UUKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_777UVaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_777UWaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IOir5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_aw4GAJmYEeiOmuqNbykpsw" target="_IOir4KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IOir5atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IOir6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_777UVqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_777UV6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_777UWKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IOir5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IOir56tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IOir6KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_78k0lKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_kK61oKE8EeqPrpdMOOTlbQ" target="_78k0kKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_78k0laV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_78lboqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IPDpRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_kK61oKE8EeqPrpdMOOTlbQ" target="_IPDpQKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IPDpRatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPEQUKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_78k0lqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_78lboKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_78lboaV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IPDpRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPDpR6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPDpSKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_79falKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MlzdkJs8EeikSLSDi2qpXA" target="_79fakKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_79falaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_79gBoKV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IPo4FKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_MlzdkJs8EeikSLSDi2qpXA" target="_IPo4EKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IPo4FatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPpfI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_79falqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_79fal6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_79famKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IPpfIKtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPpfIatkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPpfIqtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7_CSsKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_gP2P0Lq4EeimKvjOEffRIA" target="_7_BroKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_7_CSsaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7_CStaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IQvrUatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_gP2P0Lq4EeimKvjOEffRIA" target="_IQvEQKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IQvrUqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IQvrVqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7_CSsqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7_CSs6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_7_CStKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IQvrU6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IQvrVKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IQvrVatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8A8XNKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_hZNgsG9wEeqLWtFsc04LIg" target="_8A8XMKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8A8XNaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8A8XOaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ISJZhKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_hZNgsG9wEeqLWtFsc04LIg" target="_ISJZgKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ISJZhatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ISJZiatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8A8XNqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8A8XN6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8A8XOKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ISJZhqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ISJZh6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ISJZiKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8CM7caV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_YH1UkG9zEeqLWtFsc04LIg" target="_8CMUYKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8CM7cqV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8CM7dqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IS945KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_YH1UkG9zEeqLWtFsc04LIg" target="_IS944KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IS945atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IS946atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8CM7c6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8CM7dKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8CM7daV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IS945qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IS9456tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IS946KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8D6LpKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_8D6LoKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8D6LpaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8D6LqaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ITwjFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_ITwjEKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ITwjFatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ITwjGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8D6LpqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8D6Lp6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8D6LqKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ITwjFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ITwjF6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ITwjGKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8EmIIaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tsusAJCGEeq3cZ7vVOAmSw" target="_8ElhEKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8EmIIqV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8EmIJqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IUJkpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_tsusAJCGEeq3cZ7vVOAmSw" target="_IUJkoKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IUJkpatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUJkqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8EmII6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8EmIJKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8EmIJaV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IUJkpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUJkp6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUJkqKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8ExuUKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_osYdYKE2EeqPrpdMOOTlbQ" target="_8ExHQKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8ExuUaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8ExuVaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IUQ5ZKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_osYdYKE2EeqPrpdMOOTlbQ" target="_IUQ5YKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IUQ5ZatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUQ5aatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8ExuUqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8ExuU6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8ExuVKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IUQ5ZqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUQ5Z6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUQ5aKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8FWWFKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_8FWWEKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8FWWFaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8FWWGaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IUqiBKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_IUqiAKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IUqiBatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUqiCatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8FWWFqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8FWWF6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8FWWGKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IUqiBqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUqiB6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUqiCKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8GHyJKV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_z-f_8KE4EeqPrpdMOOTlbQ" target="_8GHyIKV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8GHyJaV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GHyKaV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IVH1AatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_z-f_8KE4EeqPrpdMOOTlbQ" target="_IVHN8KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IVH1AqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVH1BqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8GHyJqV8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GHyJ6V8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GHyKKV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IVH1A6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVH1BKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVH1BatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8GQVAaV8EeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_1ei2YKE4EeqPrpdMOOTlbQ" target="_8GPt8KV8EeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_8GQVAqV8EeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_8GQVBqV8EeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_IVN7oatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1ei2YKE4EeqPrpdMOOTlbQ" target="_IVNUkKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_IVN7oqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVN7pqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8GQVA6V8EeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GQVBKV8EeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8GQVBaV8EeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IVN7o6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVN7pKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVN7patkEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_xbRtgHkvEeiO-c_khjKlFQ" type="PapyrusUMLClassDiagram" name="OtsiResourceSpec" measurementUnit="Pixel">
@@ -3643,138 +3577,138 @@
       <element xsi:nil="true"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_z_3Rsrs8Eeiljfl0umr-iQ" x="781" y="-133"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wDDisKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wDDisaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDDis6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_wNDIAKWgEeqJcvXkREZ1XQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_wNDIAqWgEeqJcvXkREZ1XQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_wNB54KWgEeqJcvXkREZ1XQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wNDIAaWgEeqJcvXkREZ1XQ" x="-71" y="-384" height="50"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_HgM_MKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HgM_MatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HgM_M6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3qhKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDDisqWZEeqJcvXkREZ1XQ" x="443" y="-134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HgM_MqtkEeqiJu55eR3W2w" x="443" y="-134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wDiD0KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wDiD0aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDiq4KWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hg7_AKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hg7_AatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hg7_A6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDiD0qWZEeqJcvXkREZ1XQ" x="443" y="-234"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hg7_AqtkEeqiJu55eR3W2w" x="443" y="-234"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wECaIKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wECaIaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wEDBMKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HhYD4KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HhYD4atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HhYD46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wECaIqWZEeqJcvXkREZ1XQ" x="400" y="-480"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HhYD4qtkEeqiJu55eR3W2w" x="400" y="-480"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wEwy4KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wEwy4aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wExZ8KWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HiGcoKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HiGcoatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HiHDsKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3tBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wEwy4qWZEeqJcvXkREZ1XQ" x="860" y="-160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HiGcoqtkEeqiJu55eR3W2w" x="860" y="-160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wGEacKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wGEacaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGEac6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HjPFEKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HjPFEatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjPFE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGEacqWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjPFEqtkEeqiJu55eR3W2w" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wGQAoKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wGQAoaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGQnsKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HjXA4KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HjXA4atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjXA46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGQAoqWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjXA4qtkEeqiJu55eR3W2w" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wGcN4KWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wGcN4aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGc08KWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HjeVoKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HjeVoatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjeVo6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGcN4qWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjeVoqtkEeqiJu55eR3W2w" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wGobIKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wGobIaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGobI6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HjmRcKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HjmRcatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjmRc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wGobIqWZEeqJcvXkREZ1XQ" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjmRcqtkEeqiJu55eR3W2w" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wHc6gKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wHc6gaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wHc6g6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HkNVcKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HkNVcatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HkNVc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wHc6gqWZEeqJcvXkREZ1XQ" x="820" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HkNVcqtkEeqiJu55eR3W2w" x="820" y="-340"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wICJUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wICJUaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wICJU6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hkr2kKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hkr2katkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HksdoKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wICJUqWZEeqJcvXkREZ1XQ" x="820" y="-440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hkr2kqtkEeqiJu55eR3W2w" x="820" y="-440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wItewKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wItewaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wItew6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HltxUKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HltxUatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HltxU6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wItewqWZEeqJcvXkREZ1XQ" x="303" y="-320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HltxUqtkEeqiJu55eR3W2w" x="303" y="-320"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wJb3gKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wJb3gaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJb3g6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hmud8KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hmud8atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HmvFAKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wJb3gqWZEeqJcvXkREZ1XQ" x="303" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hmud8qtkEeqiJu55eR3W2w" x="303" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wJjzUKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wJjzUaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJkaYKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hm3A0KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hm3A0atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hm3A06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wJjzUqWZEeqJcvXkREZ1XQ" x="303" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hm3A0qtkEeqiJu55eR3W2w" x="303" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wKKQQKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wKKQQaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wKK3UKWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hn-bIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hn-bIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hn-bI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qzTdgHk7EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wKKQQqWZEeqJcvXkREZ1XQ" x="220" y="-20"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hn-bIqtkEeqiJu55eR3W2w" x="220" y="-20"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wL3gcKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wL3gcaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wL3gc6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_HpqdMKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HpqdMatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HpqdM6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wL3gcqWZEeqJcvXkREZ1XQ" x="640" y="160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HpqdMqtkEeqiJu55eR3W2w" x="640" y="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wNqQMKWZEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wNqQMaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wNqQM6WZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hq3XEKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hq3-IKtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hq3-IqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wNqQMqWZEeqJcvXkREZ1XQ" x="1080" y="180"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_wNDIAKWgEeqJcvXkREZ1XQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_wNDIAqWgEeqJcvXkREZ1XQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_wNB54KWgEeqJcvXkREZ1XQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wNDIAaWgEeqJcvXkREZ1XQ" x="-71" y="-384" height="50"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hq3-IatkEeqiJu55eR3W2w" x="1080" y="180"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_xbR3JHkvEeiO-c_khjKlFQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_xbR3JXkvEeiO-c_khjKlFQ"/>
@@ -4034,165 +3968,165 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49ELucEeiljfl0umr-iQ" id="(0.7486631016042781,1.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49EbucEeiljfl0umr-iQ" id="(0.5865102639296188,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wDDitKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_wDDisKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wDDitaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDEJwqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HgM_NKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_HgM_MKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HgM_NatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HgM_OatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3qhKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wDDitqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDEJwKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDEJwaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HgM_NqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HgM_N6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HgM_OKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wDiq4aWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_MtNH8IuXEeiu6boZkiJHCA" target="_wDiD0KWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wDiq4qWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wDiq5qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_Hg7_BKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_MtNH8IuXEeiu6boZkiJHCA" target="_Hg7_AKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Hg7_BatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hg8mEqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wDiq46WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDiq5KWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wDiq5aWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hg7_BqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hg8mEKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hg8mEatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wEDBMaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRupnkvEeiO-c_khjKlFQ" target="_wECaIKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wEDBMqWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wEDBNqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HhYD5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRupnkvEeiO-c_khjKlFQ" target="_HhYD4KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HhYD5atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HhYD6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wEDBM6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wEDBNKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wEDBNaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HhYD5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HhYD56tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HhYD6KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wExZ8aWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRu43kvEeiO-c_khjKlFQ" target="_wEwy4KWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wExZ8qWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wExZ9qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HiHDsatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRu43kvEeiO-c_khjKlFQ" target="_HiGcoKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HiHDsqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HiHDtqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3tBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wExZ86WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wExZ9KWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wExZ9aWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HiHDs6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HiHDtKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HiHDtatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wGEadKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_QoX9AIuXEeiu6boZkiJHCA" target="_wGEacKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wGEadaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGEaeaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HjPFFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_QoX9AIuXEeiu6boZkiJHCA" target="_HjPFEKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HjPFFatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjPFGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGEadqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGEad6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGEaeKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjPFFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjPFF6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjPFGKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wGQnsaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_zM5mgJs5EeikSLSDi2qpXA" target="_wGQAoKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wGQnsqWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGQntqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HjXA5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_zM5mgJs5EeikSLSDi2qpXA" target="_HjXA4KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HjXA5atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjXA6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGQns6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGQntKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGQntaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjXA5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjXA56tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjXA6KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wGc08aWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_2HPJUJs8EeikSLSDi2qpXA" target="_wGcN4KWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wGc08qWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGc09qWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HjeVpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_2HPJUJs8EeikSLSDi2qpXA" target="_HjeVoKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HjeVpatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjeVqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGc086WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGc09KWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGc09aWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjeVpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjeVp6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjeVqKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wGobJKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Y349MLucEeiljfl0umr-iQ" target="_wGobIKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wGobJaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wGobKaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HjmRdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Y349MLucEeiljfl0umr-iQ" target="_HjmRcKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HjmRdatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjmReatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wGobJqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGobJ6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wGobKKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjmRdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjmRd6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjmReKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wHc6hKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_wHc6gKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wHc6haWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wHc6iaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HkNVdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_HkNVcKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HkNVdatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HkNVeatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wHc6hqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wHc6h6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wHc6iKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HkNVdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HkNVd6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HkNVeKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wICJVKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbR3SXkvEeiO-c_khjKlFQ" target="_wICJUKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wICJVaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wICJWaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HksdoatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbR3SXkvEeiO-c_khjKlFQ" target="_Hkr2kKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HksdoqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HksdpqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wICJVqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wICJV6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wICJWKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hksdo6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HksdpKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HksdpatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wIuF0KWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_wItewKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wIuF0aWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wIuF1aWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HltxVKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_HltxUKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HltxVatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HluYYKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wIuF0qWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wIuF06WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wIuF1KWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HltxVqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HltxV6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HltxWKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wJcekKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_xbR393kvEeiO-c_khjKlFQ" target="_wJb3gKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wJcekaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJcelaWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HmvFAatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbR393kvEeiO-c_khjKlFQ" target="_Hmud8KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HmvFAqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HmvFBqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wJcekqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJcek6WZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJcelKWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HmvFA6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HmvFBKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HmvFBatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wJkaYaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_KmsHYIuXEeiu6boZkiJHCA" target="_wJjzUKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wJkaYqWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wJkaZqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_Hm3n4KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_KmsHYIuXEeiu6boZkiJHCA" target="_Hm3A0KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Hm3n4atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hm3n5atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wJkaY6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJkaZKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wJkaZaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hm3n4qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hm3n46tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hm3n5KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wKK3UaWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_sregEHk7EeiO-c_khjKlFQ" target="_wKKQQKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wKK3UqWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wKK3VqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_Hn-bJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_sregEHk7EeiO-c_khjKlFQ" target="_Hn-bIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Hn-bJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hn-bKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qzTdgHk7EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wKK3U6WZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wKK3VKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wKK3VaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hn-bJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hn-bJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hn-bKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wL3gdKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_wHswIJs5EeikSLSDi2qpXA" target="_wL3gcKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wL3gdaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wL4HgqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HprEQKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_wHswIJs5EeikSLSDi2qpXA" target="_HpqdMKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HprEQatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HprERatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wL3gdqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wL4HgKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wL4HgaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HprEQqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HprEQ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HprERKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_wNqQNKWZEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_-2iRMJs7EeikSLSDi2qpXA" target="_wNqQMKWZEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_wNqQNaWZEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wNq3QqWZEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_Hq3-I6tkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_-2iRMJs7EeikSLSDi2qpXA" target="_Hq3XEKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Hq3-JKtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hq3-KKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_wNqQNqWZEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wNq3QKWZEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_wNq3QaWZEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hq3-JatkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hq3-JqtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hq3-J6tkEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_3bpg4IoMEeivCevppATXng" type="PapyrusUMLClassDiagram" name="McResourceSpec" measurementUnit="Pixel">
@@ -4480,154 +4414,154 @@
       <element href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_asvRIZs-EeikSLSDi2qpXA" x="675" y="392" width="303" height="121"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hMgIsKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hMgIsaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hMgIs6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_gQsLQKWbEeqJcvXkREZ1XQ" type="Comment_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_gQtZYKWbEeqJcvXkREZ1XQ" type="Comment_BodyLabel"/>
+      <element href="TapiPhotonicMedia.uml#_gQZQUKWbEeqJcvXkREZ1XQ"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gQsLQaWbEeqJcvXkREZ1XQ" x="482" y="-283" height="34"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_HzK-gKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_HzK-gatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HzK-g6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hMgIsqWaEeqJcvXkREZ1XQ" x="582" y="-442"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HzK-gqtkEeqiJu55eR3W2w" x="654" y="-442"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hNOhcKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hNOhcaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNOhc6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_Hz1F0KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_Hz1F0atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hz1F06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hNOhcqWaEeqJcvXkREZ1XQ" x="840" y="-280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hz1F0qtkEeqiJu55eR3W2w" x="627" y="-53"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hNr0cKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hNr0caWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNr0c6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H0PVgKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H0PVgatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0PVg6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hNr0cqWaEeqJcvXkREZ1XQ" x="840" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H0PVgqtkEeqiJu55eR3W2w" x="627" y="-153"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hNxUAKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hNxUAaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNxUA6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H0WDMKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H0WDMatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0WDM6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hNxUAqWaEeqJcvXkREZ1XQ" x="840" y="-380"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H0WDMqtkEeqiJu55eR3W2w" x="627" y="-153"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hOUtoKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hOUtoaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOUto6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H03noKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H03noatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H03no6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hOUtoqWaEeqJcvXkREZ1XQ" x="1200" y="-160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H03noqtkEeqiJu55eR3W2w" x="1127" y="-51"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hOzOwKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hOzOwaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOzOw6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H1XW4KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H1XW4atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1XW46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hOzOwqWaEeqJcvXkREZ1XQ" x="1200" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H1XW4qtkEeqiJu55eR3W2w" x="1127" y="-151"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hO5VYKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hO5VYaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hO5VY6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H1eroKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H1eroatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1ero6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hO5VYqWaEeqJcvXkREZ1XQ" x="1200" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H1eroqtkEeqiJu55eR3W2w" x="1127" y="-151"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hPfLQKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hPfLQaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hPfLQ6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H2KoIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H2KoIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2KoI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hPfLQqWaEeqJcvXkREZ1XQ" x="740" y="-40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H2KoIqtkEeqiJu55eR3W2w" x="809" y="148"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hQQnUKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hQQnUaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQROYKWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H22koKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H22koatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H22ko6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hQQnUqWaEeqJcvXkREZ1XQ" x="740" y="-140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H22koqtkEeqiJu55eR3W2w" x="809" y="48"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hQepwKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hQepwaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQepw6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H2_HgKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H2_HgatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2_ukKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hQepwqWaEeqJcvXkREZ1XQ" x="740" y="-140"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H2_HgqtkEeqiJu55eR3W2w" x="809" y="48"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hRGU0KWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hRGU0aWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hRGU06WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H3YwIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H3YwIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H3YwI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hRGU0qWaEeqJcvXkREZ1XQ" x="117" y="-448"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H3YwIqtkEeqiJu55eR3W2w" x="117" y="-448"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hSI2oKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hSI2oaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSI2o6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H4C3cKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H4C3catkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4C3c6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hSI2oqWaEeqJcvXkREZ1XQ" x="109" y="-294"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4C3cqtkEeqiJu55eR3W2w" x="109" y="-294"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hSy98KWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hSy98aWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSy986WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H4dHIKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H4dHIatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4dHI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hSy98qWaEeqJcvXkREZ1XQ" x="109" y="-394"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4dHIqtkEeqiJu55eR3W2w" x="109" y="-394"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hS65wKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hS65waWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hS65w6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H4imsKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H4imsatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4ims6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hv9NsNnYEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hS65wqWaEeqJcvXkREZ1XQ" x="109" y="-394"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4imsqtkEeqiJu55eR3W2w" x="109" y="-394"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hTik0KWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hTik0aWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hTik06WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H4_5sKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H4_5satkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4_5s6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hTik0qWaEeqJcvXkREZ1XQ" x="160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4_5sqtkEeqiJu55eR3W2w" x="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hUsbYKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hUsbYaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hUsbY6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H6Qd8KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H6Qd8atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6RFAKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hUsbYqWaEeqJcvXkREZ1XQ" x="520" y="-240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H6Qd8qtkEeqiJu55eR3W2w" x="609" y="-244"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hVCZoKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hVCZoaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVCZo6WaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H6tw8KtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H6tw8atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6tw86tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hVCZoqWaEeqJcvXkREZ1XQ" x="520" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H6tw8qtkEeqiJu55eR3W2w" x="609" y="-344"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hVqEsKWaEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hVqEsaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVqrwKWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_H7NgMKtkEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_H7NgMatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H7NgM6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hVqEsqWaEeqJcvXkREZ1XQ" x="780" y="200"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_gQsLQKWbEeqJcvXkREZ1XQ" type="Comment_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_gQtZYKWbEeqJcvXkREZ1XQ" type="Comment_BodyLabel"/>
-      <element href="TapiPhotonicMedia.uml#_gQZQUKWbEeqJcvXkREZ1XQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gQsLQaWbEeqJcvXkREZ1XQ" x="482" y="-283" height="34"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H7NgMqtkEeqiJu55eR3W2w" x="875" y="392"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_3bpg4YoMEeivCevppATXng" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_3bpg4ooMEeivCevppATXng"/>
@@ -4918,185 +4852,185 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PbcPEMMqEei3gLXE4_XcoA" id="(1.0,0.5846153846153846)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PbcPEcMqEei3gLXE4_XcoA" id="(0.0,0.49230769230769234)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hMgItKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_SvF9cJozEeiOmuqNbykpsw" target="_hMgIsKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hMgItaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hMgIuaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_HzK-hKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SvF9cJozEeiOmuqNbykpsw" target="_HzK-gKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_HzK-hatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HzLlkqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hMgItqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hMgIt6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hMgIuKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HzK-hqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HzLlkKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HzLlkatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hNOhdKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_aiK4MJozEeiOmuqNbykpsw" target="_hNOhcKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hNOhdaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNOheaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_Hz1F1KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_aiK4MJozEeiOmuqNbykpsw" target="_Hz1F0KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_Hz1F1atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hz1s4KtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hNOhdqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNOhd6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNOheKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hz1F1qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hz1F16tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hz1F2KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hNr0dKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_c-z5wZozEeiOmuqNbykpsw" target="_hNr0cKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hNr0daWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNsbgKWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H0PVhKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_c-z5wZozEeiOmuqNbykpsw" target="_H0PVgKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H0PVhatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0PViatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hNr0dqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNr0d6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNr0eKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H0PVhqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0PVh6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0PViKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hNxUBKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qPcpYJozEeiOmuqNbykpsw" target="_hNxUAKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hNxUBaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hNxUCaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H0WDNKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_qPcpYJozEeiOmuqNbykpsw" target="_H0WDMKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H0WDNatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0WDOatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hNxUBqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNxUB6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hNxUCKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H0WDNqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0WDN6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0WDOKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hOUtpKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_a2-DgpozEeiOmuqNbykpsw" target="_hOUtoKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hOUtpaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOUtqaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H03npKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_a2-DgpozEeiOmuqNbykpsw" target="_H03noKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H03npatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H03nqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hOUtpqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOUtp6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOUtqKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H03npqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H03np6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H03nqKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hOzOxKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dbbkUJozEeiOmuqNbykpsw" target="_hOzOwKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hOzOxaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hOzOyaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H1XW5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_dbbkUJozEeiOmuqNbykpsw" target="_H1XW4KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H1XW5atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1XW6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hOzOxqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOzOx6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hOzOyKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H1XW5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1XW56tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1XW6KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hO5VZKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_quGUQJozEeiOmuqNbykpsw" target="_hO5VYKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hO5VZaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hO5VaaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H1erpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_quGUQJozEeiOmuqNbykpsw" target="_H1eroKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H1erpatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1erqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hO5VZqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hO5VZ6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hO5VaKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H1erpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1erp6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1erqKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hPfLRKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lvNYYJozEeiOmuqNbykpsw" target="_hPfLQKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hPfLRaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hPfLSaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H2KoJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lvNYYJozEeiOmuqNbykpsw" target="_H2KoIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H2KoJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2KoKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hPfLRqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hPfLR6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hPfLSKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H2KoJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2KoJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2KoKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hQROYaWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_avUEAJs-EeikSLSDi2qpXA" target="_hQQnUKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hQROYqWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQROZqWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H22kpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_avUEAJs-EeikSLSDi2qpXA" target="_H22koKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H22kpatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H22kqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hQROY6WaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQROZKWaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQROZaWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H22kpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H22kp6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H22kqKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hQepxKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tTykMLudEeiljfl0umr-iQ" target="_hQepwKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hQepxaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hQfQ0aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H2_ukatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_tTykMLudEeiljfl0umr-iQ" target="_H2_HgKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H2_ukqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2_ulqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hQepxqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQepx6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hQfQ0KWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H2_uk6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2_ulKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2_ulatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hRGU1KWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5DNQpo1EeiOmuqNbykpsw" target="_hRGU0KWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hRGU1aWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hRGU2aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H3YwJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5DNQpo1EeiOmuqNbykpsw" target="_H3YwIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H3YwJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H3ZXMqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hRGU1qWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hRGU16WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hRGU2KWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H3YwJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H3ZXMKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H3ZXMatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hSI2pKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_hSI2oKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hSI2paWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSI2qaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H4C3dKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_H4C3cKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H4C3datkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4C3eatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hSI2pqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSI2p6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSI2qKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4C3dqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4C3d6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4C3eKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hSy99KWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5DNMJo1EeiOmuqNbykpsw" target="_hSy98KWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hSy99aWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hSy9-aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H4dHJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5DNMJo1EeiOmuqNbykpsw" target="_H4dHIKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H4dHJatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4dHKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hSy99qWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSy996WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hSy9-KWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4dHJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4dHJ6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4dHKKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hS65xKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5JURJo1EeiOmuqNbykpsw" target="_hS65wKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hS65xaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hS65yaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H4imtKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5JURJo1EeiOmuqNbykpsw" target="_H4imsKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H4imtatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4imuatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hv9NsNnYEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hS65xqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hS65x6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hS65yKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4imtqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4imt6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4imuKtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hTik1KWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_F5JUXpo1EeiOmuqNbykpsw" target="_hTik0KWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hTik1aWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hTik2aWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H4_5tKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5JUXpo1EeiOmuqNbykpsw" target="_H4_5sKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H4_5tatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H5AgwqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hTik1qWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hTik16WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hTik2KWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4_5tqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H5AgwKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H5AgwatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hUsbZKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WDKY0JqMEeid4dfn4JFJZg" target="_hUsbYKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hUsbZaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hUsbaaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H6RFAatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_WDKY0JqMEeid4dfn4JFJZg" target="_H6Qd8KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H6RFAqtkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6RFBqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hUsbZqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hUsbZ6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hUsbaKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H6RFA6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6RFBKtkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6RFBatkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hVCZpKWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_dkQywJqMEeid4dfn4JFJZg" target="_hVCZoKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hVCZpaWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVCZqaWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H6tw9KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_dkQywJqMEeid4dfn4JFJZg" target="_H6tw8KtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H6tw9atkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6tw-atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hVCZpqWaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVCZp6WaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVCZqKWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H6tw9qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6tw96tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6tw-KtkEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hVqrwaWaEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_asvRIJs-EeikSLSDi2qpXA" target="_hVqEsKWaEeqJcvXkREZ1XQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_hVqrwqWaEeqJcvXkREZ1XQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hVqrxqWaEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_H7NgNKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_asvRIJs-EeikSLSDi2qpXA" target="_H7NgMKtkEeqiJu55eR3W2w">
+      <styles xsi:type="notation:FontStyle" xmi:id="_H7NgNatkEeqiJu55eR3W2w"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H7NgOatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hVqrw6WaEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVqrxKWaEeqJcvXkREZ1XQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_hVqrxaWaEeqJcvXkREZ1XQ"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H7NgNqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H7NgN6tkEeqiJu55eR3W2w"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H7NgOKtkEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_47kdwPJSEeiTnqcAgKK24Q" type="PapyrusUMLClassDiagram" name="ServiceInterfaceSpec" measurementUnit="Pixel">
diff --git a/UML/TapiPhotonicMedia.uml b/UML/TapiPhotonicMedia.uml
index c817ef6f..37ca10c3 100644
--- a/UML/TapiPhotonicMedia.uml
+++ b/UML/TapiPhotonicMedia.uml
@@ -51,7 +51,7 @@ License: This module is distributed under the Apache License 2.0</body>
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_Y9qecHiHEeiPPoPDo3q5jA" name="OtsiSipSpecAugmentsSip" client="_EqncAHiHEeiPPoPDo3q5jA">
         <supplier xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XqurIHkwEeiO-c_khjKlFQ" name="OtsiACsepSpecAugmentsCsep" client="_O0PLkHkwEeiO-c_khjKlFQ">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XqurIHkwEeiO-c_khjKlFQ" name="OtsiCsepSpecAugmentsCsep" client="_O0PLkHkwEeiO-c_khjKlFQ">
         <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_aZjdUHk6EeiO-c_khjKlFQ" name="OtsiCsepHasOtsiConfigPac" memberEnd="_aZkrcnk6EeiO-c_khjKlFQ _aZmgoHk6EeiO-c_khjKlFQ">
@@ -279,28 +279,6 @@ License: This module is distributed under the Apache License 2.0</body>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_UyBxsBKOEeajhbtskMXJfw" name="Diagrams">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_LytUoKE8EeqPrpdMOOTlbQ">
-        <body>TAPI 2.1.3 RC1</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="__wm_QKE8EeqPrpdMOOTlbQ">
-        <body>In RC2 replace with composition from MediaChannelConfigPac</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_4vKOwKGJEeqPrpdMOOTlbQ">
-        <body>Zero = full delegation</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_Ee-r4KGKEeqPrpdMOOTlbQ">
-        <body>Zero = full delegation does not apply for MC</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_NEvZEKGQEeqPrpdMOOTlbQ">
-        <body>capacity attribute: total capacity of an MCA/OTSiMCA&#xD;
-Capacity may be omitted if spectrum is specified.&#xD;
-Capacity cannot be omitted if spectrum is not specified</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_dn05cKGnEeqPrpdMOOTlbQ">
-        <body>OTSiMCA Connectivity Service:&#xD;
-1) re-use MediaChannelAConnectivityServiceEndPointSpec, using CSEPHasServerCSEP recursive association&#xD;
-2) introduce new OTSiAMcConnectivityServiceEndPointSpec - allowing richer provisioning options</body>
-      </ownedComment>
       <ownedComment xmi:type="uml:Comment" xmi:id="_gQZQUKWbEeqJcvXkREZ1XQ">
         <body>Deprecate explicit MCA CEP</body>
       </ownedComment>
@@ -457,6 +435,13 @@ Capacity cannot be omitted if spectrum is not specified</body>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_XVi5wHk6EeiO-c_khjKlFQ" name="OtsiTerminationConfigPac">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_6Ol6cKr7EeqiJu55eR3W2w" annotatedElement="_XVi5wHk6EeiO-c_khjKlFQ">
+          <body>This class allows the provisioning of the parameters of a single OTSi.&#xD;
+In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec), it is intended that the choice of the parameter values is fully delegated to the server controller.</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_WZGgkKt5EeqiJu55eR3W2w">
+          <general xmi:type="uml:Class" href="TapiCommon.uml#_UhrZoN8qEeWT9tG0gGLRFw"/>
+        </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_8MWlMMDSEeiXyMZOD9tv6w" name="centralFrequency" type="_KjQ3xBKOEeajhbtskMXJfw">
           <ownedComment xmi:type="uml:Comment" xmi:id="_PV7o0MG9EeiAg83ctgK3eQ" annotatedElement="_8MWlMMDSEeiXyMZOD9tv6w">
             <body>The central frequency of the laser. It is the oscillation frequency of the corresponding electromagnetic wave</body>
@@ -571,11 +556,20 @@ Capacity cannot be omitted if spectrum is not specified</body>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_awx_YJmYEeiOmuqNbykpsw" name="MediaChannelConfigPac">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_zP1YkKr7EeqiJu55eR3W2w" annotatedElement="_awx_YJmYEeiOmuqNbykpsw">
+          <body>This class allows the provisioning of the parameters of a single MC / OTSiMC.&#xD;
+The [1..*] with MediaChannelAConnectivityServiceEndPointSpec allows the configuration of power properties (PowerManagementConfigPac) even in case of no spectrum specified, i.e. &quot;empty&quot; MediaChannelConfigPac.</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_aCBIAKt5EeqiJu55eR3W2w">
+          <general xmi:type="uml:Class" href="TapiCommon.uml#_UhrZoN8qEeWT9tG0gGLRFw"/>
+        </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_i18IoJmYEeiOmuqNbykpsw" name="spectrum" type="_wB7jIHPYEeiPPoPDo3q5jA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xeF8kJqPEeid4dfn4JFJZg" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xeMDMJqPEeid4dfn4JFJZg" value="1"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_BAev4Kr6EeqiJu55eR3W2w" annotatedElement="_i18IoJmYEeiOmuqNbykpsw">
+            <body></body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xeF8kJqPEeid4dfn4JFJZg"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_kDTKsKE8EeqPrpdMOOTlbQ" name="powermanagementconfigpac" type="_hZGL8G9wEeqLWtFsc04LIg" aggregation="composite" association="_kDRVgKE8EeqPrpdMOOTlbQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_kDTKsKE8EeqPrpdMOOTlbQ" name="_powerManagementConfigPac" type="_hZGL8G9wEeqLWtFsc04LIg" aggregation="composite" association="_kDRVgKE8EeqPrpdMOOTlbQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kDZRUaE8EeqPrpdMOOTlbQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kDZRUqE8EeqPrpdMOOTlbQ" value="1"/>
         </ownedAttribute>
@@ -722,6 +716,16 @@ at the Logical-Termination-Point (LTP) associated to the SIP.</body>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_pqLs8KE3EeqPrpdMOOTlbQ" name="MediaChannelAConnectivityServiceEndPointSpec">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tTqKgKr6EeqiJu55eR3W2w" annotatedElement="_pqLs8KE3EeqPrpdMOOTlbQ">
+          <body>This class allows the provisioning of MCA/OTSiMCA (*) ConnectivityService.&#xD;
+It is possible to provision either&#xD;
+1) MC/OTSiMC bandwidth/capacity or&#xD;
+2) MC/OTSiMC spectrum.&#xD;
+For the provisioning of &quot;OTSiMCA&quot; ConnectivityService the MediaChannelAConnectivityServiceEndPointSpec is used,&#xD;
+leveraging the Layer Protocol Qualifier of CSEP (*) and the CSEPHasServerCSEP recursive association in case of combined provisioning, i.e.&#xD;
+when OTSiMCA&quot; ConnectivityService provisioning drives also creation of &quot;supporting&quot; MCs.&#xD;
+(*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_1ZwdAKE4EeqPrpdMOOTlbQ" name="_mcConfig" type="_awx_YJmYEeiOmuqNbykpsw" aggregation="composite" association="_1ZmsAKE4EeqPrpdMOOTlbQ">
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1cF38KE7EeqPrpdMOOTlbQ" value="*"/>
         </ownedAttribute>
@@ -730,11 +734,23 @@ at the Logical-Termination-Point (LTP) associated to the SIP.</body>
           <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_2YCbcaE-EeqPrpdMOOTlbQ" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_BscEEKGQEeqPrpdMOOTlbQ" name="capacity">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_zPolcKsVEeqiJu55eR3W2w" annotatedElement="_BscEEKGQEeqPrpdMOOTlbQ">
+            <body>Total capacity of an MCA/OTSiMCA.&#xD;
+Capacity may be omitted if spectrum is specified.&#xD;
+Capacity cannot be omitted if spectrum is not specified.</body>
+          </ownedComment>
           <type xmi:type="uml:DataType" href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I2SboKGQEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_j1MmMJCGEeq3cZ7vVOAmSw" name="OtsiAConnectivityServiceEndPointSpec">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_un5ZkKr6EeqiJu55eR3W2w" annotatedElement="_j1MmMJCGEeq3cZ7vVOAmSw">
+          <body>This class allows the provisioning of OTSiA (*) ConnectivityService.&#xD;
+It is possible to either &#xD;
+1) delegate the choice of all OTSi characteristics to the server controller (zero OtsiTerminationConfigPac instances), or&#xD;
+2) specify one, more or all OtsiTerminationConfigPac parameters.&#xD;
+(*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_tmlAsJCGEeq3cZ7vVOAmSw" name="_otsiConfig" type="_XVi5wHk6EeiO-c_khjKlFQ" aggregation="composite" association="_tmgvQJCGEeq3cZ7vVOAmSw">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3hUioKGJEeqPrpdMOOTlbQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tms8gJCGEeq3cZ7vVOAmSw" value="*"/>
diff --git a/UML/TapiStreaming.notation b/UML/TapiStreaming.notation
index 58c12dc7..c78bbd75 100644
--- a/UML/TapiStreaming.notation
+++ b/UML/TapiStreaming.notation
@@ -1800,245 +1800,245 @@
       <element xmi:type="uml:Constraint" href="TapiStreaming.uml#_8KcbEHjSEeqVN_GB3rPx7g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8KdpMXjSEeqVN_GB3rPx7g" x="620" y="660"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MB7P0KsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MB7P0asVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MB7P06sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vPLnwIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vPLnwYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPLnw4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_eXlBcGWwEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MB7P0qsVEeqJkrhxjCnY4A" x="420" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vPLnwoZ2Eeq0u836hWSfvw" x="420" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MCTqUKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MCTqUasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MCTqU6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vPXN8IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vPXN8YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPXN84Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_X3gNYGW1EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MCTqUqsVEeqJkrhxjCnY4A" x="420" y="-80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vPXN8oZ2Eeq0u836hWSfvw" x="420" y="-80"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MCc0QKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MCc0QasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MCdbUKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vPcGcIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vPcGcYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPcGc4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_YZxM8GW1EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MCc0QqsVEeqJkrhxjCnY4A" x="420" y="-80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vPcGcoZ2Eeq0u836hWSfvw" x="420" y="-80"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MC78cKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MC78casVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MC8jgKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vPqv8IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vPqv8YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPqv84Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_im_oMGWwEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MC78cqsVEeqJkrhxjCnY4A" x="280" y="240"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vPqv8oZ2Eeq0u836hWSfvw" x="280" y="240"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MEZ8EKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MEZ8EasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MEZ8E6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vQJREIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vQJREYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQJRE4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_lKL9sGWwEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MEZ8EqsVEeqJkrhxjCnY4A" x="660" y="240"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vQJREoZ2Eeq0u836hWSfvw" x="660" y="240"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MFRewKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MFRewasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MFSF0KsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vQku4IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vQku4YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQlV8IZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_2U15kGW1EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MFRewqsVEeqJkrhxjCnY4A" x="760" y="520"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vQku4oZ2Eeq0u836hWSfvw" x="760" y="520"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MFjyoKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MFjyoasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MFkZsKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vQuf4IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vQuf4YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQuf44Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_i2jWAG3mEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MFjyoqsVEeqJkrhxjCnY4A" x="760" y="420"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vQuf4oZ2Eeq0u836hWSfvw" x="760" y="420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MF5J0KsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MF5J0asVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MF5J06sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vQ4Q4IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vQ4Q4YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQ4Q44Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Signal" href="TapiStreaming.uml#_X9ay8LqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MF5J0qsVEeqJkrhxjCnY4A" x="520" y="-160"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vQ4Q4oZ2Eeq0u836hWSfvw" x="520" y="-160"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MGHzUKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MGHzUasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MGHzU6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vQ--kIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vQ--kYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQ--k4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_s9prgLqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MGHzUqsVEeqJkrhxjCnY4A" x="520" y="-260"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vQ--koZ2Eeq0u836hWSfvw" x="520" y="-260"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MGnikKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MGnikasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MGnik6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vRNoEIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vRNoEYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRNoE4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_gv58QLqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MGnikqsVEeqJkrhxjCnY4A" x="120" y="-540"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRNoEoZ2Eeq0u836hWSfvw" x="120" y="-540"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MG52cKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MG52casVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MG52c6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vRZOQIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vRZOQYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRZOQ4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_5n-CALqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MG52cqsVEeqJkrhxjCnY4A" x="120" y="-640"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRZOQoZ2Eeq0u836hWSfvw" x="120" y="-640"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MG_9EKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MG_9EasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MG_9E6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vRc4oIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vRc4oYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRdfsIZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_AiVEsLqOEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MG_9EqsVEeqJkrhxjCnY4A" x="120" y="-640"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRc4ooZ2Eeq0u836hWSfvw" x="120" y="-640"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MHJHAKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MHJHAasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MHJHA6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vRiYMIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vRiYMYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRiYM4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#__-BWYLqQEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MHJHAqsVEeqJkrhxjCnY4A" x="120" y="-640"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRiYMoZ2Eeq0u836hWSfvw" x="120" y="-640"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MH58AKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MH58AasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MH58A6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vR6LoIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vR6LoYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vR6Lo4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MH58AqsVEeqJkrhxjCnY4A" x="960" y="-520"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vR6LooZ2Eeq0u836hWSfvw" x="960" y="-520"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MIjcQKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MIjcQasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MIjcQ6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vSQw8IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vSQw8YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vSQw84Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_6bbCwLqLEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIjcQqsVEeqJkrhxjCnY4A" x="120" y="-340"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vSQw8oZ2Eeq0u836hWSfvw" x="120" y="-340"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MJdbMKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MJdbMasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MJeCQKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vSn9U4Z2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vSn9VIZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vSn9VoZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiStreaming.uml#_dBX4MLqOEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MJdbMqsVEeqJkrhxjCnY4A" x="740" y="-640"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vSn9VYZ2Eeq0u836hWSfvw" x="740" y="-640"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MKJXsKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MKJXsasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MKJXs6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vS2m0IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vS2m0YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vS2m04Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_qFJloLqQEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MKJXsqsVEeqJkrhxjCnY4A" x="-264" y="-220"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vS2m0oZ2Eeq0u836hWSfvw" x="-264" y="-220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ML32AKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ML32AasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ML4dEKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vTnb0IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vTnb0YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vTnb04Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_MJPYYBXeEeqAktXlUG_iEw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ML32AqsVEeqJkrhxjCnY4A" x="100" y="80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vTnb0oZ2Eeq0u836hWSfvw" x="100" y="80"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MMXlQKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MMXlQasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MMYMUKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vTxz4IZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vTxz4YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vTxz44Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_5Xt9oBXeEeqAktXlUG_iEw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MMXlQqsVEeqJkrhxjCnY4A" x="100" y="-20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vTxz4oZ2Eeq0u836hWSfvw" x="100" y="-20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MM3UgKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MM3UgasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MM3Ug6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vUBrgIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vUBrgYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUBrg4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiStreaming.uml#_S1CbEBy6EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MM3UgqsVEeqJkrhxjCnY4A" x="-260" y="-640"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vUBrgoZ2Eeq0u836hWSfvw" x="-260" y="-640"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MNWcsKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MNWcsasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MNXDwKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vUUmcIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vUUmcYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUUmc4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_jdeiEBy8EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MNWcsqsVEeqJkrhxjCnY4A" x="1020" y="-400"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vUUmcoZ2Eeq0u836hWSfvw" x="1020" y="-400"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MNp-sKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MNp-sasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MNp-s6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vUflkIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vUflkYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUflk4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_01YpEBy8EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MNp-sqsVEeqJkrhxjCnY4A" x="1020" y="-500"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vUflkoZ2Eeq0u836hWSfvw" x="1020" y="-500"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MNzvsKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MNzvsasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MNzvs6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vUj3AIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vUj3AYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUj3A4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_a-lNsBy9EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MNzvsqsVEeqJkrhxjCnY4A" x="1020" y="-500"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vUj3AoZ2Eeq0u836hWSfvw" x="1020" y="-500"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MOWiQKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MOWiQasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MOXJUKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vUzHkIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vUzHkYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUzuoIZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_R-mlEBXlEeqAktXlUG_iEw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MOWiQqsVEeqJkrhxjCnY4A" x="1020" y="-200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vUzHkoZ2Eeq0u836hWSfvw" x="1020" y="-200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MP3lMKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MP3lMasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MP3lM6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vVedAIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vVedAYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vVedA4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_B0Zw4B-1EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MP3lMqsVEeqJkrhxjCnY4A" x="400" y="800"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vVedAoZ2Eeq0u836hWSfvw" x="400" y="800"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MQTDAKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MQTDAasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MQTqEKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vVrRUIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vVrRUYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vVrRU4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_sBHOQB-1EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MQTDAqsVEeqJkrhxjCnY4A" x="400" y="700"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vVrRUoZ2Eeq0u836hWSfvw" x="400" y="700"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MQzZUKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MQzZUasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MQzZU6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vWABcIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vWABcYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vWABc4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_4ZR50G31EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MQzZUqsVEeqJkrhxjCnY4A" x="400" y="520"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWABcoZ2Eeq0u836hWSfvw" x="400" y="520"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MR-eAKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MR-eAasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MR-eA6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vWi0AIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vWi0AYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vWi0A4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_yXZTUC45EeqsBLPUmmYf3g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MR-eAqsVEeqJkrhxjCnY4A" x="400" y="420"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWi0AoZ2Eeq0u836hWSfvw" x="400" y="420"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MS2nwKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MS2nwasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MS2nw6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vXCjQIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vXCjQYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vXCjQ4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_3Uj4oD0mEeqNzoiCK4mkvg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MS2nwqsVEeqJkrhxjCnY4A" x="100" y="-60"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vXCjQoZ2Eeq0u836hWSfvw" x="100" y="-60"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MTHtgKsVEeqJkrhxjCnY4A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTHtgasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MTHtg6sVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_vXNiYIZ2Eeq0u836hWSfvw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vXNiYYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vXNiY4Z2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_wYS0oD0nEeqNzoiCK4mkvg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTHtgqsVEeqJkrhxjCnY4A" x="100" y="-160"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vXNiYoZ2Eeq0u836hWSfvw" x="100" y="-160"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_z6ANmB-3EeqCeNa5GcKdyg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_z6ANmR-3EeqCeNa5GcKdyg"/>
@@ -2457,305 +2457,305 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xDRc4HjTEeqVN_GB3rPx7g" id="(0.06578947368421052,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xDRc4XjTEeqVN_GB3rPx7g" id="(0.5257142857142857,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MB7P1KsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z59u8R-3EeqCeNa5GcKdyg" target="_MB7P0KsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MB7P1asVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MB724KsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vPLnxIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z59u8R-3EeqCeNa5GcKdyg" target="_vPLnwIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vPLnxYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPLnyYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_eXlBcGWwEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MB7P1qsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MB7P16sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MB7P2KsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vPLnxoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPLnx4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPLnyIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MCTqVKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6ANmx-3EeqCeNa5GcKdyg" target="_MCTqUKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MCTqVasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MCTqWasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vPXN9IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6ANmx-3EeqCeNa5GcKdyg" target="_vPXN8IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vPXN9YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPXN-YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_X3gNYGW1EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MCTqVqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCTqV6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCTqWKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vPXN9oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPXN94Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPXN-IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MCdbUasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6ANtR-3EeqCeNa5GcKdyg" target="_MCc0QKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MCdbUqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MCdbVqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vPcGdIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6ANtR-3EeqCeNa5GcKdyg" target="_vPcGcIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vPcGdYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPcGeYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_YZxM8GW1EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MCdbU6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCdbVKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCdbVasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vPcGdoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPcGd4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPcGeIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MC9KkKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z59vhh-3EeqCeNa5GcKdyg" target="_MC78cKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MC9KkasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MC9KlasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vPqv9IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z59vhh-3EeqCeNa5GcKdyg" target="_vPqv8IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vPqv9YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vPqv-YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_im_oMGWwEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MC9KkqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MC9Kk6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MC9KlKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vPqv9oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPqv94Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPqv-IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MEZ8FKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5-XOR-3EeqCeNa5GcKdyg" target="_MEZ8EKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MEZ8FasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MEZ8GasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vQJRFIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5-XOR-3EeqCeNa5GcKdyg" target="_vQJREIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vQJRFYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQJ4IIZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_lKL9sGWwEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MEZ8FqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MEZ8F6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MEZ8GKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vQJRFoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQJRF4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQJRGIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MFSF0asVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5-YLh-3EeqCeNa5GcKdyg" target="_MFRewKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MFSF0qsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MFSF1qsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vQlV8YZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5-YLh-3EeqCeNa5GcKdyg" target="_vQku4IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vQlV8oZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQlV9oZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_2U15kGW1EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MFSF06sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MFSF1KsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MFSF1asVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vQlV84Z2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQlV9IZ2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQlV9YZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MFkZsasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6ANzx-3EeqCeNa5GcKdyg" target="_MFjyoKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MFkZsqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MFkZtqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vQuf5IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6ANzx-3EeqCeNa5GcKdyg" target="_vQuf4IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vQuf5YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQuf6YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_i2jWAG3mEemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MFkZs6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MFkZtKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MFkZtasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vQuf5oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQuf54Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQuf6IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MF5J1KsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5-_eR-3EeqCeNa5GcKdyg" target="_MF5J0KsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MF5J1asVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MF5J2asVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vQ4Q5IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5-_eR-3EeqCeNa5GcKdyg" target="_vQ4Q4IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vQ4Q5YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQ4Q6YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Signal" href="TapiStreaming.uml#_X9ay8LqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MF5J1qsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MF5J16sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MF5J2KsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vQ4Q5oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQ4Q54Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQ4Q6IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MGHzVKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6AOEB-3EeqCeNa5GcKdyg" target="_MGHzUKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MGHzVasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MGIaYqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vQ--lIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6AOEB-3EeqCeNa5GcKdyg" target="_vQ--kIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vQ--lYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vQ--mYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_s9prgLqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MGHzVqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MGIaYKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MGIaYasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vQ--loZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQ--l4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQ--mIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MGnilKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5-_yR-3EeqCeNa5GcKdyg" target="_MGnikKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MGnilasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MGoJoKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vRNoFIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5-_yR-3EeqCeNa5GcKdyg" target="_vRNoEIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vRNoFYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRNoGYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_gv58QLqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MGnilqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MGnil6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MGnimKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vRNoFoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRNoF4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRNoGIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MG6dgKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6AOJB-3EeqCeNa5GcKdyg" target="_MG52cKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MG6dgasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MG6dhasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vRZORIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6AOJB-3EeqCeNa5GcKdyg" target="_vRZOQIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vRZORYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRZOSYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_5n-CALqKEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MG6dgqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MG6dg6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MG6dhKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vRZORoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRZOR4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRZOSIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MG_9FKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6AOSR-3EeqCeNa5GcKdyg" target="_MG_9EKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MG_9FasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MG_9GasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vRdfsYZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6AOSR-3EeqCeNa5GcKdyg" target="_vRc4oIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vRdfsoZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRdftoZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_AiVEsLqOEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MG_9FqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MG_9F6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MG_9GKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vRdfs4Z2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRdftIZ2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRdftYZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MHJHBKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6AObh-3EeqCeNa5GcKdyg" target="_MHJHAKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MHJHBasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MHJHCasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vRiYNIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6AObh-3EeqCeNa5GcKdyg" target="_vRiYMIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vRiYNYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vRiYOYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#__-BWYLqQEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MHJHBqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MHJHB6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MHJHCKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vRiYNoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRiYN4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRiYOIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MH58BKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5_AXh-3EeqCeNa5GcKdyg" target="_MH58AKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MH58BasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MH58CasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vR6LpIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5_AXh-3EeqCeNa5GcKdyg" target="_vR6LoIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vR6LpYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vR6LqYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MH58BqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MH58B6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MH58CKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vR6LpoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vR6Lp4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vR6LqIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MIjcRKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5_AtR-3EeqCeNa5GcKdyg" target="_MIjcQKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MIjcRasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MIjcSasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vSQw9IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5_AtR-3EeqCeNa5GcKdyg" target="_vSQw8IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vSQw9YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vSQw-YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_6bbCwLqLEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MIjcRqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MIjcR6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MIjcSKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vSQw9oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vSQw94Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vSQw-IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MJeCQasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5_kbx-3EeqCeNa5GcKdyg" target="_MJdbMKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MJeCQqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MJeCRqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vSn9V4Z2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5_kbx-3EeqCeNa5GcKdyg" target="_vSn9U4Z2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vSn9WIZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vSn9XIZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiStreaming.uml#_dBX4MLqOEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MJeCQ6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MJeCRKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MJeCRasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vSn9WYZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vSn9WoZ2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vSn9W4Z2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MKJXtKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5_kvh-3EeqCeNa5GcKdyg" target="_MKJXsKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MKJXtasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MKJXuasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vS2m1IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5_kvh-3EeqCeNa5GcKdyg" target="_vS2m0IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vS2m1YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vS2m2YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_qFJloLqQEemx9sMHf8Tuig"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MKJXtqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MKJXt6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MKJXuKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vS2m1oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vS2m14Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vS2m2IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ML4dEasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z5_nXR-3EeqCeNa5GcKdyg" target="_ML32AKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ML4dEqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ML4dFqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vTnb1IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z5_nXR-3EeqCeNa5GcKdyg" target="_vTnb0IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vTnb1YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vTnb2YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_MJPYYBXeEeqAktXlUG_iEw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ML4dE6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ML4dFKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ML4dFasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vTnb1oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vTnb14Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vTnb2IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MMYMUasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6AOyx-3EeqCeNa5GcKdyg" target="_MMXlQKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MMYMUqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MMYMVqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vTxz5IZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6AOyx-3EeqCeNa5GcKdyg" target="_vTxz4IZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vTxz5YZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vTxz6YZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_5Xt9oBXeEeqAktXlUG_iEw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MMYMU6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MMYMVKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MMYMVasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vTxz5oZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vTxz54Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vTxz6IZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MM3UhKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_z6AMFB-3EeqCeNa5GcKdyg" target="_MM3UgKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MM3UhasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MM37kasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vUBrhIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_z6AMFB-3EeqCeNa5GcKdyg" target="_vUBrgIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vUBrhYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUBriYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiStreaming.uml#_S1CbEBy6EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MM3UhqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MM3Uh6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MM37kKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vUBrhoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUBrh4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUBriIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MNXDwasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_woVFcB-_EeqCeNa5GcKdyg" target="_MNWcsKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MNXDwqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MNXDxqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vUUmdIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_woVFcB-_EeqCeNa5GcKdyg" target="_vUUmcIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vUUmdYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUUmeYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_jdeiEBy8EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MNXDw6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MNXDxKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MNXDxasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vUUmdoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUUmd4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUUmeIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MNp-tKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_wsbiUB-_EeqCeNa5GcKdyg" target="_MNp-sKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MNp-tasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MNp-uasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vUfllIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_wsbiUB-_EeqCeNa5GcKdyg" target="_vUflkIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vUfllYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUgMoIZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_01YpEBy8EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MNp-tqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MNp-t6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MNp-uKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vUflloZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUfll4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUflmIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MNzvtKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_wvgrgB-_EeqCeNa5GcKdyg" target="_MNzvsKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MNzvtasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MN0WwasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vUj3BIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_wvgrgB-_EeqCeNa5GcKdyg" target="_vUj3AIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vUj3BYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUkeEoZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiStreaming.uml#_a-lNsBy9EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MNzvtqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MNzvt6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MN0WwKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vUj3BoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUkeEIZ2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUkeEYZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MOXwYKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_wqlIMB-_EeqCeNa5GcKdyg" target="_MOWiQKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MOXwYasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MOXwZasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vUzuoYZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_wqlIMB-_EeqCeNa5GcKdyg" target="_vUzHkIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vUzuooZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vUzupoZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_R-mlEBXlEeqAktXlUG_iEw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MOXwYqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MOXwY6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MOXwZKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vUzuo4Z2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUzupIZ2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUzupYZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MP3lNKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_K04yYy45EeqsBLPUmmYf3g" target="_MP3lMKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MP3lNasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MP4MQKsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vVedBIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_K04yYy45EeqsBLPUmmYf3g" target="_vVedAIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vVedBYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vVedCYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_B0Zw4B-1EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MP3lNqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MP3lN6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MP3lOKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vVedBoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vVedB4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vVedCIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MQTqEasVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_K06Agy45EeqsBLPUmmYf3g" target="_MQTDAKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MQTqEqsVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MQTqFqsVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vVrRVIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_K06Agy45EeqsBLPUmmYf3g" target="_vVrRUIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vVrRVYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vVrRWYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_sBHOQB-1EeqCeNa5GcKdyg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MQTqE6sVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MQTqFKsVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MQTqFasVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vVrRVoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vVrRV4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vVrRWIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MQzZVKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_K06Aly45EeqsBLPUmmYf3g" target="_MQzZUKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MQzZVasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MQzZWasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vWABdIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_K06Aly45EeqsBLPUmmYf3g" target="_vWABcIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vWABdYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vWABeYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_4ZR50G31EemRDKXaAompzQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MQzZVqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MQzZV6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MQzZWKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vWABdoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vWABd4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vWABeIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MR-eBKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_yXeL0C45EeqsBLPUmmYf3g" target="_MR-eAKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MR-eBasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MR-eCasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vWi0BIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_yXeL0C45EeqsBLPUmmYf3g" target="_vWi0AIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vWi0BYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vWi0CYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_yXZTUC45EeqsBLPUmmYf3g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MR-eBqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MR-eB6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MR-eCKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vWi0BoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vWi0B4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vWi0CIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MS2nxKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_3UtCkD0mEeqNzoiCK4mkvg" target="_MS2nwKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MS2nxasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MS2nyasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vXCjRIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_3UtCkD0mEeqNzoiCK4mkvg" target="_vXCjQIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vXCjRYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vXCjSYZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiStreaming.uml#_3Uj4oD0mEeqNzoiCK4mkvg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MS2nxqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MS2nx6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MS2nyKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vXCjRoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXCjR4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXCjSIZ2Eeq0u836hWSfvw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MTHthKsVEeqJkrhxjCnY4A" type="StereotypeCommentLink" source="_wYXGED0nEeqNzoiCK4mkvg" target="_MTHtgKsVEeqJkrhxjCnY4A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MTHthasVEeqJkrhxjCnY4A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MTHtiasVEeqJkrhxjCnY4A" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_vXNiZIZ2Eeq0u836hWSfvw" type="StereotypeCommentLink" source="_wYXGED0nEeqNzoiCK4mkvg" target="_vXNiYIZ2Eeq0u836hWSfvw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vXNiZYZ2Eeq0u836hWSfvw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vXOJcIZ2Eeq0u836hWSfvw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiStreaming.uml#_wYS0oD0nEeqNzoiCK4mkvg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MTHthqsVEeqJkrhxjCnY4A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MTHth6sVEeqJkrhxjCnY4A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MTHtiKsVEeqJkrhxjCnY4A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vXNiZoZ2Eeq0u836hWSfvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXNiZ4Z2Eeq0u836hWSfvw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXNiaIZ2Eeq0u836hWSfvw"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_O8hXUEHbEeqO_YO5cZovrw" type="PapyrusUMLClassDiagram" name="StreamSkeleton" measurementUnit="Pixel">
diff --git a/UML/TapiTopology.notation b/UML/TapiTopology.notation
index 43793c53..39874816 100644
--- a/UML/TapiTopology.notation
+++ b/UML/TapiTopology.notation
@@ -4537,8 +4537,5 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4R-UaIZqEeqZobVcFzbEhg"/>
     </edges>
   </notation:Diagram>
-  <css:ModelStyleSheets xmi:id="_-TQ04KGnEeqPrpdMOOTlbQ">
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
-  </css:ModelStyleSheets>
+  <css:ModelStyleSheets xmi:id="_-TQ04KGnEeqPrpdMOOTlbQ"/>
 </xmi:XMI>
diff --git a/UML/TapiVirtualNetwork.notation b/UML/TapiVirtualNetwork.notation
index fff8bfa1..62c4db6d 100644
--- a/UML/TapiVirtualNetwork.notation
+++ b/UML/TapiVirtualNetwork.notation
@@ -371,157 +371,157 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kN8sgRM8Eee0L_IMWjydgQ" x="548" y="-41" width="202" height="73"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jHi8kKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jHi8kaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHjjoKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LvdVEKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LvdVEas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LvdVE6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHi8kqasEeqJcvXkREZ1XQ" x="875" y="79"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvdVEqs8EeqiJu55eR3W2w" x="875" y="79"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jHq4YKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jHq4YaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHq4Y6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lvl38Ks8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lvl38as8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lvl386s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHq4YqasEeqJcvXkREZ1XQ" x="875" y="-21"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lvl38qs8EeqiJu55eR3W2w" x="875" y="-21"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jHzbQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jHzbQaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jH0CUKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lvvo8Ks8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lvvo8as8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LvwQAKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHzbQqasEeqJcvXkREZ1XQ" x="875" y="-21"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lvvo8qs8EeqiJu55eR3W2w" x="875" y="-21"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jICEwKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jICEwaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jICEw6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lv_gkKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lv_gkas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwAHoKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jICEwqasEeqJcvXkREZ1XQ" x="493" y="252"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lv_gkqs8EeqiJu55eR3W2w" x="493" y="252"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jIRVU6asEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jIRVVKasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIRVVqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LwTpoKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LwTpoas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwTpo6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIRVVaasEeqJcvXkREZ1XQ" x="501" y="75"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LwTpoqs8EeqiJu55eR3W2w" x="501" y="75"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jIXb8KasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jIXb8aasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIXb86asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lwi6MKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lwi6Mas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwjhQKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIXb8qasEeqJcvXkREZ1XQ" x="501" y="-25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lwi6Mqs8EeqiJu55eR3W2w" x="501" y="-25"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jIdikKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jIdikaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIdik6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LwsrMKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LwsrMas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwsrM6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIdikqasEeqJcvXkREZ1XQ" x="501" y="-25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LwsrMqs8EeqiJu55eR3W2w" x="501" y="-25"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jIkQQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jIkQQaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIkQQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lw1OEKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lw1OEas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lw11IKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_oWBRAPTaEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIkQQqasEeqJcvXkREZ1XQ" x="501" y="-25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lw1OEqs8EeqiJu55eR3W2w" x="501" y="-25"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jIuBQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jIuBQaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIuBQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LxCpcKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LxCpcas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LxDQgKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiVirtualNetwork.uml#_02QCUPUlEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jIuBQqasEeqJcvXkREZ1XQ" x="174" y="77"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LxCpcqs8EeqiJu55eR3W2w" x="174" y="77"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jI944KasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jI944aasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jI9446asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LxWLcKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LxWLcas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LxYnsKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jI944qasEeqJcvXkREZ1XQ" x="874" y="383"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LxWLcqs8EeqiJu55eR3W2w" x="874" y="383"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jJO-oKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jJO-oaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJO-o6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LxwbIKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LxwbIas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LxwbI6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJO-oqasEeqJcvXkREZ1XQ" x="865" y="259"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LxwbIqs8EeqiJu55eR3W2w" x="865" y="259"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jJXhgKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jJXhgaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJXhg6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lx8BUKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lx8BUas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lx8oYKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJXhgqasEeqJcvXkREZ1XQ" x="865" y="159"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lx8BUqs8EeqiJu55eR3W2w" x="865" y="159"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jJjHsKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jJjHsaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJjHs6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LyMgAKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LyMgAas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LyMgA6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJjHsqasEeqJcvXkREZ1XQ" x="177" y="208"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LyMgAqs8EeqiJu55eR3W2w" x="177" y="208"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jJ5F86asEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jJ5F9KasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJ5tAKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lyn90Ks8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lyn90as8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lyn906s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jJ5F9aasEeqJcvXkREZ1XQ" x="1075" y="151"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lyn90qs8EeqiJu55eR3W2w" x="1075" y="151"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jKEFEKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jKEFEaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKEFE6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Ly5qoKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ly5qoas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ly6RsKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKEFEqasEeqJcvXkREZ1XQ" x="496" y="387"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ly5qoqs8EeqiJu55eR3W2w" x="496" y="387"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jKPrQKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jKPrQaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKPrQ6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LzL-gKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LzL-gas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LzMlkKs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKPrQqasEeqJcvXkREZ1XQ" x="189" y="-40"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LzL-gqs8EeqiJu55eR3W2w" x="189" y="-40"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jKY1MKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jKY1MaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKY1M6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lze5cKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lze5cas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lze5c6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiVirtualNetwork.uml#_m5z10BM8Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKY1MqasEeqJcvXkREZ1XQ" x="189" y="-140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lze5cqs8EeqiJu55eR3W2w" x="189" y="-140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jKdtsKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jKdtsaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKdts6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_LzlnIKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LzlnIas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LzlnI6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_S3gd4Mh5EeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKdtsqasEeqJcvXkREZ1XQ" x="189" y="-140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LzlnIqs8EeqiJu55eR3W2w" x="189" y="-140"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jKqiAKasEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jKqiAaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKqiA6asEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Lz6-UKs8EeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Lz6-Uas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lz6-U6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKqiAqasEeqJcvXkREZ1XQ" x="748" y="-41"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lz6-Uqs8EeqiJu55eR3W2w" x="748" y="-41"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_g5NmgTBJEeaSroGqGbZ6jg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_g5NmgjBJEeaSroGqGbZ6jg"/>
@@ -892,195 +892,195 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GuspgouUEeiu6boZkiJHCA" points="[517, 112, -643984, -643984]$[675, 107, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JaKxQIuUEeiu6boZkiJHCA" id="(1.0,0.2891566265060241)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jHjjoaasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfOIUDBJEeaSroGqGbZ6jg" target="_jHi8kKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jHjjoqasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHjjpqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LvdVFKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lfOIUDBJEeaSroGqGbZ6jg" target="_LvdVEKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LvdVFas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LvdVGas8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jHjjo6asEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHjjpKasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHjjpaasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LvdVFqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LvdVF6s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LvdVGKs8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jHq4ZKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_AHxY0IuUEeiu6boZkiJHCA" target="_jHq4YKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jHq4ZaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHrfcqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Lvl39Ks8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_AHxY0IuUEeiu6boZkiJHCA" target="_Lvl38Ks8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Lvl39as8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lvl3-as8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jHq4ZqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHrfcKasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jHrfcaasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lvl39qs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lvl396s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lvl3-Ks8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jH0CUaasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_D7StwIuUEeiu6boZkiJHCA" target="_jHzbQKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jH0CUqasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jH0CVqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LvwQAas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_D7StwIuUEeiu6boZkiJHCA" target="_Lvvo8Ks8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LvwQAqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LvwQBqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jH0CU6asEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jH0CVKasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jH0CVaasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LvwQA6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LvwQBKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LvwQBas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jICExKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfOIkTBJEeaSroGqGbZ6jg" target="_jICEwKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jICExaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jICEyaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LwAHoas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lfOIkTBJEeaSroGqGbZ6jg" target="_Lv_gkKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LwAHoqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwAHpqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_pbiZgPTYEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jICExqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jICEx6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jICEyKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwAHo6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwAHpKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwAHpas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jIRVV6asEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_jIRVU6asEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jIRVWKasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIRVXKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LwTppKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lfOI0jBJEeaSroGqGbZ6jg" target="_LwTpoKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LwTppas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwTpqas8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_--7mUPTUEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIRVWaasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIRVWqasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIRVW6asEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwTppqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwTpp6s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwTpqKs8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jIXb9KasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_oCZUQIuTEeiu6boZkiJHCA" target="_jIXb8KasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jIXb9aasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIXb-aasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LwjhQas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_oCZUQIuTEeiu6boZkiJHCA" target="_Lwi6MKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LwjhQqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwjhRqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_9CCfAPTYEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIXb9qasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIXb96asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIXb-KasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwjhQ6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwjhRKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwjhRas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jIdilKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_qDzLUIuTEeiu6boZkiJHCA" target="_jIdikKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jIdilaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIdimaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LwsrNKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_qDzLUIuTEeiu6boZkiJHCA" target="_LwsrMKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LwsrNas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LwtSQqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_fr8GsPTjEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIdilqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIdil6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIdimKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwsrNqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwtSQKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LwtSQas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jIk3UKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_GuspgIuUEeiu6boZkiJHCA" target="_jIkQQKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jIk3UaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIk3VaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Lw11Ias8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_GuspgIuUEeiu6boZkiJHCA" target="_Lw1OEKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Lw11Iqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lw11Jqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_oWBRAPTaEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIk3UqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIk3U6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIk3VKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lw11I6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lw11JKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lw11Jas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jIuBRKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfX5hTBJEeaSroGqGbZ6jg" target="_jIuBQKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jIuBRaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jIuoUaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LxDQgas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lfX5hTBJEeaSroGqGbZ6jg" target="_LxCpcKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LxDQgqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LxDQhqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiVirtualNetwork.uml#_02QCUPUlEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jIuBRqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIuBR6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jIuoUKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LxDQg6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxDQhKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxDQhas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jI945KasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfX6KTBJEeaSroGqGbZ6jg" target="_jI944KasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jI945aasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jI-f8KasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LxYnsas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lfX6KTBJEeaSroGqGbZ6jg" target="_LxWLcKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LxYnsqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LxYntqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jI945qasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jI9456asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jI946KasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LxYns6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxYntKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxYntas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jJO-pKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_lfX6kjBJEeaSroGqGbZ6jg" target="_jJO-oKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jJPlsKasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJPltKasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LxwbJKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lfX6kjBJEeaSroGqGbZ6jg" target="_LxwbIKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LxwbJas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LxwbKas8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJPlsaasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJPlsqasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJPls6asEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LxwbJqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxwbJ6s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxwbKKs8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jJXhhKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_96EyMIuTEeiu6boZkiJHCA" target="_jJXhgKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jJXhhaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJXhiaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Lx8oYas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_96EyMIuTEeiu6boZkiJHCA" target="_Lx8BUKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Lx8oYqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lx8oZqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJXhhqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJXhh6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJXhiKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lx8oY6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lx8oZKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lx8oZas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jJjHtKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_M5-vQD3vEea-1_BGg-qcjQ" target="_jJjHsKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jJjHtaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJjHuaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LyMgBKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_M5-vQD3vEea-1_BGg-qcjQ" target="_LyMgAKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LyMgBas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LyNHEas8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_BBDOEPTgEeWQB8HQFBfkJQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJjHtqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJjHt6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJjHuKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LyMgBqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LyMgB6s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LyNHEKs8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jJ5tAaasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7ro1kEJwEea-2Meh9kw1kA" target="_jJ5F86asEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jJ5tAqasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jJ5tBqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Lyn91Ks8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7ro1kEJwEea-2Meh9kw1kA" target="_Lyn90Ks8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Lyn91as8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lyn92as8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jJ5tA6asEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJ5tBKasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jJ5tBaasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lyn91qs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lyn916s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lyn92Ks8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jKEFFKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_N-VAYE0SEeaqn4OIuRCwEg" target="_jKEFEKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jKEFFaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKEFGaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Ly6Rsas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_N-VAYE0SEeaqn4OIuRCwEg" target="_Ly5qoKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ly6Rsqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ly6Rtqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKEFFqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKEFF6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKEFGKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ly6Rs6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ly6RtKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ly6Rtas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jKPrRKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_FMDagsh5EeaVlemTikmRHw" target="_jKPrQKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jKPrRaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKQSUqasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LzMlkas8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_FMDagsh5EeaVlemTikmRHw" target="_LzL-gKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LzMlkqs8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LzMllqs8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiVirtualNetwork.uml#_FKbC0Mh5EeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKPrRqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKQSUKasEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKQSUaasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LzMlk6s8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LzMllKs8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LzMllas8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jKY1NKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_m50c4BM8Eee0L_IMWjydgQ" target="_jKY1MKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jKY1NaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKZcQaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Lze5dKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_m50c4BM8Eee0L_IMWjydgQ" target="_Lze5cKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Lze5das8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lze5eas8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiVirtualNetwork.uml#_m5z10BM8Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKY1NqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKY1N6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKZcQKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lze5dqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lze5d6s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lze5eKs8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jKdttKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ksw1MIuTEeiu6boZkiJHCA" target="_jKdtsKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jKdttaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKdtuaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_LzlnJKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ksw1MIuTEeiu6boZkiJHCA" target="_LzlnIKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LzlnJas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LzmOM6s8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiVirtualNetwork.uml#_S3gd4Mh5EeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKdttqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKdtt6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKdtuKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LzmOMKs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LzmOMas8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LzmOMqs8EeqiJu55eR3W2w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jKqiBKasEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_kN8sgBM8Eee0L_IMWjydgQ" target="_jKqiAKasEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jKqiBaasEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKqiCaasEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Lz7lYKs8EeqiJu55eR3W2w" type="StereotypeCommentLink" source="_kN8sgBM8Eee0L_IMWjydgQ" target="_Lz6-UKs8EeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Lz7lYas8EeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Lz7lZas8EeqiJu55eR3W2w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKqiBqasEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKqiB6asEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jKqiCKasEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lz7lYqs8EeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lz7lY6s8EeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lz7lZKs8EeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_IjOs8EQ7EeaktYCiiVTurg" type="PapyrusUMLClassDiagram" name="VirtualNwDetails" measurementUnit="Pixel">
@@ -1399,5 +1399,8 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g0hxGKasEeqJcvXkREZ1XQ"/>
     </edges>
   </notation:Diagram>
-  <css:ModelStyleSheets xmi:id="_qwcnoKasEeqJcvXkREZ1XQ"/>
+  <css:ModelStyleSheets xmi:id="_qwcnoKasEeqJcvXkREZ1XQ">
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  </css:ModelStyleSheets>
 </xmi:XMI>
diff --git a/YANG/tapi-connectivity@2020-04-23.yang b/YANG/tapi-connectivity@2020-04-23.yang
index 4611be7a..0cdc187f 100644
--- a/YANG/tapi-connectivity@2020-04-23.yang
+++ b/YANG/tapi-connectivity@2020-04-23.yang
@@ -15,7 +15,7 @@ module tapi-connectivity {
          Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_yiFzE6g$ >
          Project List: <mailto:transport-api@opennetworking.org>
          Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>
-         Andrea Mazzin <mailto:andrea.mazzini@nokia.com>
+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>
          Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>
          Nigel Davis <mailto:ndavis@ciena.com>";
     description "
@@ -35,6 +35,7 @@ module tapi-connectivity {
         License: This module is distributed under the Apache License 2.0.";
     revision 2020-04-23 {
         description "ONF Transport API version 2.1.3.
+                   - Minor corrections in comments.
                    Changes included in this TAPI release (v2.1.3) are listed in
                    <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xm1nx_D$ >";
         reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model
@@ -405,9 +406,8 @@ module tapi-connectivity {
             description "Provides optional resilience and state attributes to the Route.";
         }
         uses tapi-common:local-class;
-        description "The FC Route (FcRoute) object class models the individual routes of an FC. 
-            The route of an FC object is represented by a list of FCs at a lower level. 
-            Note that depending on the service supported by an FC, an the FC can have multiple routes.";
+        description "The Route of a Connection is modeled as a collection of Connection End Points.
+            The logical order of the Connection End Points within the Route object can be inferred by the TAPI client by the knowledge of the Topology information.";
     }
     grouping connectivity-context {
         list connectivity-service {
@@ -548,7 +548,7 @@ module tapi-connectivity {
             config false;
             description "Value of 0 (zero) means 'unspecified priority'.
                 Highest priority is 1, sometimes referred as 'preferred' or 'main' or 'intended' route.
-                Then 2 has lower priory than 1, 3 has lower priory than 2, etc.";
+                2 has lower priority than 1, 3 has lower priority than 2, etc.";
         }
         leaf route-state {
             type route-state;
diff --git a/YANG/tapi-notification@2020-04-23.yang b/YANG/tapi-notification@2020-04-23.yang
index 9d4cfbd2..762f924b 100644
--- a/YANG/tapi-notification@2020-04-23.yang
+++ b/YANG/tapi-notification@2020-04-23.yang
@@ -29,6 +29,7 @@ module tapi-notification {
         License: This module is distributed under the Apache License 2.0";
     revision 2020-04-23 {
         description "ONF Transport API version 2.1.3.
+                   - Added DEVICE to ObjectType.
                    Changes included in this TAPI release (v2.1.3) are listed in
                    <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";
         reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model
@@ -418,6 +419,9 @@ module tapi-notification {
             enum ABSTRACT_STRAND {
                 description "none";
             }
+            enum DEVICE {
+                description "none";
+            }
         }
         description "The list of TAPI Global Object Class types on which Notifications can be raised.";
     }
diff --git a/YANG/tapi-photonic-media@2020-04-23.tree b/YANG/tapi-photonic-media@2020-04-23.tree
index 559e18b2..e4dc3769 100644
--- a/YANG/tapi-photonic-media@2020-04-23.tree
+++ b/YANG/tapi-photonic-media@2020-04-23.tree
@@ -122,6 +122,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +--rw total-power-warn-threshold-upper?   decimal64
           +--rw total-power-warn-threshold-lower?   decimal64
+          +--rw local-id?                           string
+          +--rw name* [value-name]
+             +--rw value-name    string
+             +--rw value?        string
   augment /tapi-common:context/tapi-common:service-interface-point:
     +--rw media-channel-service-interface-point-spec
        +--ro mc-pool
@@ -160,11 +164,28 @@ module: tapi-photonic-media
     +--rw media-channel-connectivity-service-end-point-spec
        +--rw mc-config
        |  +--rw spectrum
-       |     +--rw upper-frequency?        uint64
-       |     +--rw lower-frequency?        uint64
-       |     +--rw frequency-constraint
-       |        +--rw adjustment-granularity?   adjustment-granularity
-       |        +--rw grid-type?                grid-type
+       |  |  +--rw upper-frequency?        uint64
+       |  |  +--rw lower-frequency?        uint64
+       |  |  +--rw frequency-constraint
+       |  |     +--rw adjustment-granularity?   adjustment-granularity
+       |  |     +--rw grid-type?                grid-type
+       |  +--rw power-management-config-pac
+       |  |  +--rw intended-maximum-output-power
+       |  |  |  +--rw total-power?              decimal64
+       |  |  |  +--rw power-spectral-density?   decimal64
+       |  |  +--rw intended-minimum-output-power
+       |  |  |  +--rw total-power?              decimal64
+       |  |  |  +--rw power-spectral-density?   decimal64
+       |  |  +--rw expected-maximum-input-power
+       |  |  |  +--rw total-power?              decimal64
+       |  |  |  +--rw power-spectral-density?   decimal64
+       |  |  +--rw expected-minimum-input-power
+       |  |     +--rw total-power?              decimal64
+       |  |     +--rw power-spectral-density?   decimal64
+       |  +--rw local-id?                      string
+       |  +--rw name* [value-name]
+       |     +--rw value-name    string
+       |     +--rw value?        string
        +--rw power-management-config
           +--rw intended-maximum-output-power
           |  +--rw total-power?              decimal64
@@ -214,11 +235,28 @@ module: tapi-photonic-media
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
        |  +-- spectrum
-       |     +-- upper-frequency?        uint64
-       |     +-- lower-frequency?        uint64
-       |     +-- frequency-constraint
-       |        +-- adjustment-granularity?   adjustment-granularity
-       |        +-- grid-type?                grid-type
+       |  |  +-- upper-frequency?        uint64
+       |  |  +-- lower-frequency?        uint64
+       |  |  +-- frequency-constraint
+       |  |     +-- adjustment-granularity?   adjustment-granularity
+       |  |     +-- grid-type?                grid-type
+       |  +-- power-management-config-pac
+       |  |  +-- intended-maximum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- intended-minimum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-maximum-input-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-minimum-input-power
+       |  |     +-- total-power?              decimal64
+       |  |     +-- power-spectral-density?   decimal64
+       |  +-- local-id?                      string
+       |  +-- name* [value-name]
+       |     +-- value-name    string
+       |     +-- value?        string
        +-- power-management-config
           +-- intended-maximum-output-power
           |  +-- total-power?              decimal64
@@ -236,11 +274,28 @@ module: tapi-photonic-media
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
        |  +-- spectrum
-       |     +-- upper-frequency?        uint64
-       |     +-- lower-frequency?        uint64
-       |     +-- frequency-constraint
-       |        +-- adjustment-granularity?   adjustment-granularity
-       |        +-- grid-type?                grid-type
+       |  |  +-- upper-frequency?        uint64
+       |  |  +-- lower-frequency?        uint64
+       |  |  +-- frequency-constraint
+       |  |     +-- adjustment-granularity?   adjustment-granularity
+       |  |     +-- grid-type?                grid-type
+       |  +-- power-management-config-pac
+       |  |  +-- intended-maximum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- intended-minimum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-maximum-input-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-minimum-input-power
+       |  |     +-- total-power?              decimal64
+       |  |     +-- power-spectral-density?   decimal64
+       |  +-- local-id?                      string
+       |  +-- name* [value-name]
+       |     +-- value-name    string
+       |     +-- value?        string
        +-- power-management-config
           +-- intended-maximum-output-power
           |  +-- total-power?              decimal64
@@ -258,11 +313,28 @@ module: tapi-photonic-media
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
        |  +-- spectrum
-       |     +-- upper-frequency?        uint64
-       |     +-- lower-frequency?        uint64
-       |     +-- frequency-constraint
-       |        +-- adjustment-granularity?   adjustment-granularity
-       |        +-- grid-type?                grid-type
+       |  |  +-- upper-frequency?        uint64
+       |  |  +-- lower-frequency?        uint64
+       |  |  +-- frequency-constraint
+       |  |     +-- adjustment-granularity?   adjustment-granularity
+       |  |     +-- grid-type?                grid-type
+       |  +-- power-management-config-pac
+       |  |  +-- intended-maximum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- intended-minimum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-maximum-input-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-minimum-input-power
+       |  |     +-- total-power?              decimal64
+       |  |     +-- power-spectral-density?   decimal64
+       |  +-- local-id?                      string
+       |  +-- name* [value-name]
+       |     +-- value-name    string
+       |     +-- value?        string
        +-- power-management-config
           +-- intended-maximum-output-power
           |  +-- total-power?              decimal64
@@ -280,11 +352,28 @@ module: tapi-photonic-media
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
        |  +-- spectrum
-       |     +-- upper-frequency?        uint64
-       |     +-- lower-frequency?        uint64
-       |     +-- frequency-constraint
-       |        +-- adjustment-granularity?   adjustment-granularity
-       |        +-- grid-type?                grid-type
+       |  |  +-- upper-frequency?        uint64
+       |  |  +-- lower-frequency?        uint64
+       |  |  +-- frequency-constraint
+       |  |     +-- adjustment-granularity?   adjustment-granularity
+       |  |     +-- grid-type?                grid-type
+       |  +-- power-management-config-pac
+       |  |  +-- intended-maximum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- intended-minimum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-maximum-input-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-minimum-input-power
+       |  |     +-- total-power?              decimal64
+       |  |     +-- power-spectral-density?   decimal64
+       |  +-- local-id?                      string
+       |  +-- name* [value-name]
+       |     +-- value-name    string
+       |     +-- value?        string
        +-- power-management-config
           +-- intended-maximum-output-power
           |  +-- total-power?              decimal64
@@ -302,11 +391,28 @@ module: tapi-photonic-media
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
        |  +-- spectrum
-       |     +-- upper-frequency?        uint64
-       |     +-- lower-frequency?        uint64
-       |     +-- frequency-constraint
-       |        +-- adjustment-granularity?   adjustment-granularity
-       |        +-- grid-type?                grid-type
+       |  |  +-- upper-frequency?        uint64
+       |  |  +-- lower-frequency?        uint64
+       |  |  +-- frequency-constraint
+       |  |     +-- adjustment-granularity?   adjustment-granularity
+       |  |     +-- grid-type?                grid-type
+       |  +-- power-management-config-pac
+       |  |  +-- intended-maximum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- intended-minimum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-maximum-input-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-minimum-input-power
+       |  |     +-- total-power?              decimal64
+       |  |     +-- power-spectral-density?   decimal64
+       |  +-- local-id?                      string
+       |  +-- name* [value-name]
+       |     +-- value-name    string
+       |     +-- value?        string
        +-- power-management-config
           +-- intended-maximum-output-power
           |  +-- total-power?              decimal64
@@ -324,11 +430,28 @@ module: tapi-photonic-media
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
        |  +-- spectrum
-       |     +-- upper-frequency?        uint64
-       |     +-- lower-frequency?        uint64
-       |     +-- frequency-constraint
-       |        +-- adjustment-granularity?   adjustment-granularity
-       |        +-- grid-type?                grid-type
+       |  |  +-- upper-frequency?        uint64
+       |  |  +-- lower-frequency?        uint64
+       |  |  +-- frequency-constraint
+       |  |     +-- adjustment-granularity?   adjustment-granularity
+       |  |     +-- grid-type?                grid-type
+       |  +-- power-management-config-pac
+       |  |  +-- intended-maximum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- intended-minimum-output-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-maximum-input-power
+       |  |  |  +-- total-power?              decimal64
+       |  |  |  +-- power-spectral-density?   decimal64
+       |  |  +-- expected-minimum-input-power
+       |  |     +-- total-power?              decimal64
+       |  |     +-- power-spectral-density?   decimal64
+       |  +-- local-id?                      string
+       |  +-- name* [value-name]
+       |     +-- value-name    string
+       |     +-- value?        string
        +-- power-management-config
           +-- intended-maximum-output-power
           |  +-- total-power?              decimal64
@@ -455,6 +578,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +-- total-power-warn-threshold-upper?   decimal64
           +-- total-power-warn-threshold-lower?   decimal64
+          +-- local-id?                           string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- otsi-connectivity-service-end-point-spec
        +-- otsi-config
@@ -479,6 +606,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +-- total-power-warn-threshold-upper?   decimal64
           +-- total-power-warn-threshold-lower?   decimal64
+          +-- local-id?                           string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- otsi-connectivity-service-end-point-spec
        +-- otsi-config
@@ -503,6 +634,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +-- total-power-warn-threshold-upper?   decimal64
           +-- total-power-warn-threshold-lower?   decimal64
+          +-- local-id?                           string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- otsi-connectivity-service-end-point-spec
        +-- otsi-config
@@ -527,6 +662,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +-- total-power-warn-threshold-upper?   decimal64
           +-- total-power-warn-threshold-lower?   decimal64
+          +-- local-id?                           string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point:
     +-- otsi-connectivity-service-end-point-spec
        +-- otsi-config
@@ -551,6 +690,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +-- total-power-warn-threshold-upper?   decimal64
           +-- total-power-warn-threshold-lower?   decimal64
+          +-- local-id?                           string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- otsi-connectivity-service-end-point-spec
        +-- otsi-config
@@ -575,6 +718,10 @@ module: tapi-photonic-media
           |  +--ro power-spectral-density?   decimal64
           +-- total-power-warn-threshold-upper?   decimal64
           +-- total-power-warn-threshold-lower?   decimal64
+          +-- local-id?                           string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip:
     +-- otsi-service-interface-point-spec
        +--ro otsi-capability
@@ -704,3 +851,62 @@ module: tapi-photonic-media
              +--ro laser-application-type?   laser-type
              +--ro laser-bias-current?       decimal64
              +--ro laser-temperature?        decimal64
+  augment /tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point:
+    +--rw otsi-aconnectivity-service-end-point-spec
+       +--rw otsi-config* [local-id]
+       |  +--rw central-frequency
+       |  |  +--rw frequency-constraint
+       |  |  |  +--rw adjustment-granularity?   adjustment-granularity
+       |  |  |  +--rw grid-type?                grid-type
+       |  |  +--rw central-frequency?      uint64
+       |  +--rw spectrum
+       |  |  +--rw upper-frequency?        uint64
+       |  |  +--rw lower-frequency?        uint64
+       |  |  +--rw frequency-constraint
+       |  |     +--rw adjustment-granularity?   adjustment-granularity
+       |  |     +--rw grid-type?                grid-type
+       |  +--rw application-identifier
+       |  |  +--rw application-identifier-type?   application-identifier-type
+       |  |  +--rw application-code?              string
+       |  +--rw modulation?                         modulation-technique
+       |  +--rw laser-control?                      laser-control-type
+       |  +--rw transmit-power
+       |  |  +--rw total-power?              decimal64
+       |  |  +--ro power-spectral-density?   decimal64
+       |  +--rw total-power-warn-threshold-upper?   decimal64
+       |  +--rw total-power-warn-threshold-lower?   decimal64
+       |  +--rw local-id                            string
+       |  +--rw name* [value-name]
+       |     +--rw value-name    string
+       |     +--rw value?        string
+       +--rw number-of-otsi?   uint64
+  augment /tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point:
+    +--rw media-channel-aconnectivity-service-end-point-spec
+       +--rw mc-config* [local-id]
+       |  +--rw spectrum
+       |  |  +--rw upper-frequency?        uint64
+       |  |  +--rw lower-frequency?        uint64
+       |  |  +--rw frequency-constraint
+       |  |     +--rw adjustment-granularity?   adjustment-granularity
+       |  |     +--rw grid-type?                grid-type
+       |  +--rw power-management-config-pac
+       |  |  +--rw intended-maximum-output-power
+       |  |  |  +--rw total-power?              decimal64
+       |  |  |  +--rw power-spectral-density?   decimal64
+       |  |  +--rw intended-minimum-output-power
+       |  |  |  +--rw total-power?              decimal64
+       |  |  |  +--rw power-spectral-density?   decimal64
+       |  |  +--rw expected-maximum-input-power
+       |  |  |  +--rw total-power?              decimal64
+       |  |  |  +--rw power-spectral-density?   decimal64
+       |  |  +--rw expected-minimum-input-power
+       |  |     +--rw total-power?              decimal64
+       |  |     +--rw power-spectral-density?   decimal64
+       |  +--rw local-id                       string
+       |  +--rw name* [value-name]
+       |     +--rw value-name    string
+       |     +--rw value?        string
+       +--rw number-of-mc?   uint64
+       +--rw capacity
+          +--rw value?   uint64
+          +--rw unit?    capacity-unit
diff --git a/YANG/tapi-photonic-media@2020-04-23.yang b/YANG/tapi-photonic-media@2020-04-23.yang
index 0dd04bf9..97972523 100644
--- a/YANG/tapi-photonic-media@2020-04-23.yang
+++ b/YANG/tapi-photonic-media@2020-04-23.yang
@@ -35,6 +35,18 @@ module tapi-photonic-media {
         License: This module is distributed under the Apache License 2.0";
     revision 2020-04-23 {
         description "ONF Transport API version 2.1.3.
+                   - OtsiConnectivityServiceEndPointSpec class, deprecated
+                   - New OtsiAConnectivityServiceEndPointSpec, with numberOfOTSi property (integer).
+                   - OtsiCsepHasOtsiConfigPac association, move from 1-1 to 0-*, i.e. allowing more OtsiTerminationConfigPac instances per OTSi CSEP
+                     This allows to move from one OTSi CSEP instance per OTSi signal to one OTSi CSEP instance including the information related to
+                     + zero (full delegation),
+                     + 1 or more (constrained provisioning) OTSi signals.
+                   - OtsiTerminationConfigPac class, make all properties as optional (0..1)
+                     + This allows delegation or specification of selected properties
+                   - Similar modification for Media Channel: MediaChannelConnectivityServiceEndPointSpec deprecated
+                   - New MediaChannelAssemblyConnectivityServiceEndPointSpec, add capacity property.
+                   - SmcCsepHasMcConfigPac association, move from 1-1 to 1-*
+                   - MediaChannelConfigPac, set spectrum attribute as optional [0..1].
                    Changes included in this TAPI release (v2.1.3) are listed in
                    <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";
         reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model
@@ -292,6 +304,20 @@ module tapi-photonic-media {
         }
         description "none";
     }
+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {
+        container otsi-aconnectivity-service-end-point-spec {
+            uses otsi-aconnectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {
+        container media-channel-aconnectivity-service-end-point-spec {
+            uses media-channel-aconnectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
     /**************************
     * package object-classes
     **************************/ 
@@ -502,7 +528,9 @@ module tapi-photonic-media {
             }
             description "Allows to configure the Lowerpower threshold which is expected to be different from Default, but within the Min and Max values specified as OTSi SIP capability.";
         }
-        description "none";
+        uses tapi-common:local-class;
+        description "This class allows the provisioning of the parameters of a single OTSi.
+            In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec), it is intended that the choice of the parameter values is fully delegated to the server controller.";
     }
     grouping fec-properties-pac {
         leaf pre-fec-ber {
@@ -565,7 +593,13 @@ module tapi-photonic-media {
             uses spectrum-band;
             description "none";
         }
-        description "none";
+        container power-management-config-pac {
+            uses power-management-config-pac;
+            description "none";
+        }
+        uses tapi-common:local-class;
+        description "This class allows the provisioning of the parameters of a single MC / OTSiMC.
+            The [1..*] with MediaChannelAConnectivityServiceEndPointSpec allows the configuration of power properties (PowerManagementConfigPac) even in case of no spectrum specified, i.e. 'empty' MediaChannelConfigPac.";
     }
     grouping media-channel-connection-end-point-spec {
         container media-channel {
@@ -714,6 +748,49 @@ module tapi-photonic-media {
         }
         description "none";
     }
+    grouping media-channel-aconnectivity-service-end-point-spec {
+        list mc-config {
+            key 'local-id';
+            uses media-channel-config-pac;
+            description "none";
+        }
+        leaf number-of-mc {
+            type uint64;
+            default "1";
+            description "none";
+        }
+        container capacity {
+            uses tapi-common:capacity-value;
+            description "Total capacity of an MCA/OTSiMCA.
+                Capacity may be omitted if spectrum is specified.
+                Capacity cannot be omitted if spectrum is not specified.";
+        }
+        description "This class allows the provisioning of MCA/OTSiMCA (*) ConnectivityService.
+            It is possible to provision either
+            1) MC/OTSiMC bandwidth/capacity or
+            2) MC/OTSiMC spectrum.
+            For the provisioning of 'OTSiMCA' ConnectivityService the MediaChannelAConnectivityServiceEndPointSpec is used,
+            leveraging the Layer Protocol Qualifier of CSEP (*) and the CSEPHasServerCSEP recursive association in case of combined provisioning, i.e.
+            when OTSiMCA' ConnectivityService provisioning drives also creation of 'supporting' MCs.
+            (*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.";
+    }
+    grouping otsi-aconnectivity-service-end-point-spec {
+        list otsi-config {
+            key 'local-id';
+            uses otsi-termination-config-pac;
+            description "none";
+        }
+        leaf number-of-otsi {
+            type uint64;
+            default "1";
+            description "none";
+        }
+        description "This class allows the provisioning of OTSiA (*) ConnectivityService.
+            It is possible to either 
+            1) delegate the choice of all OTSi characteristics to the server controller (zero OtsiTerminationConfigPac instances), or
+            2) specify one, more or all OtsiTerminationConfigPac parameters.
+            (*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.";
+    }
 
     /**************************
     * package type-definitions
diff --git a/YANG/tapi-streaming@2020-04-23.tree b/YANG/tapi-streaming@2020-04-23.tree
index e4048f5b..4253b1ab 100644
--- a/YANG/tapi-streaming@2020-04-23.tree
+++ b/YANG/tapi-streaming@2020-04-23.tree
@@ -1,2471 +1,2473 @@
-
-module: tapi-streaming
-  augment /tapi-common:context:
-    +--rw stream-admin-context {tapi-streaming-admin}?
-       +--ro stream-monitor* [uuid]
-       |  +--ro id-of-last-record-read-from-log?    string
-       |  +--ro id-of-last-record-written-to-log?   string
-       |  +--ro available-stream
-       |  |  +--ro available-stream-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/available-stream/uuid
-       |  +--ro client-id?                          string
-       |  +--ro last-updated?                       tapi-common:date-and-time
-       |  +--ro client-address?                     string
-       |  +--ro uuid                                uuid
-       |  +--ro name* [value-name]
-       |     +--ro value-name    string
-       |     +--ro value?        string
-       +--rw uuid?             uuid
-       +--rw name* [value-name]
-          +--rw value-name    string
-          +--rw value?        string
-  augment /tapi-common:context:
-    +--rw stream-context {tapi-streaming}?
-       +--ro available-stream* [uuid]
-       |  +--ro connection-address?      string
-       |  +--ro stream-state?            stream-state
-       |  +--ro supported-stream-type
-       |  |  +--ro supported-stream-type-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/supported-stream-type/uuid
-       |  +--ro stream-id?               string
-       |  +--ro connection-protocol?     string
-       |  +--ro uuid                     uuid
-       |  +--ro name* [value-name]
-       |     +--ro value-name    string
-       |     +--ro value?        string
-       +--ro supported-stream-type* [uuid]
-          +--ro stream-type-name?              string
-          +--ro record-retention?              string
-          +--ro segment-size?                  string
-          +--ro record-content*                object-class-identifier
-          +--ro log-storage-strategy?          log-storage-strategy
-          +--ro log-record-strategy?           log-record-strategy
-          +--ro uuid                           uuid
-          +--ro name* [value-name]
-          |  +--ro value-name    string
-          |  +--ro value?        string
-          +--rw compacted-log-details {tapi-streaming}?
-          |  +--ro tombstone-retention?   string
-          |  +--ro compaction-delay?      string
-          +--ro connection-protocol-details {tapi-streaming}?
-             +--ro allowed-connection-protocols*   string
-
-  rpcs:
-    +---x connect-to-stream
-    |  +---w input
-    |     +---w start-from-token?     string
-    |     +---w connection-address?   string
-    +---x get-available-stream-connection-details
-    |  +--ro output
-    |     +--ro active-connections* []
-    |        +--ro connection-address?      string
-    |        +--ro stream-state?            stream-state
-    |        +--ro supported-stream-type
-    |        |  +--ro supported-stream-type-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/supported-stream-type/uuid
-    |        +--ro stream-id?               string
-    |        +--ro connection-protocol?     string
-    |        +--ro uuid?                    uuid
-    |        +--ro name* [value-name]
-    |           +--ro value-name    string
-    |           +--ro value?        string
-    +---x get-supported-stream-connection-types
-       +--ro output
-          +--ro supported-stream-types* []
-             +--ro stream-type-name?       string
-             +--ro record-retention?       string
-             +--ro segment-size?           string
-             +--ro record-content*         object-class-identifier
-             +--ro log-storage-strategy?   log-storage-strategy
-             +--ro log-record-strategy?    log-record-strategy
-             +--ro uuid?                   uuid
-             +--ro name* [value-name]
-                +--ro value-name    string
-                +--ro value?        string
-
-  notifications:
-    +---n stream-record
-       +--ro log-record* []
-          +--ro log-record-header
-          |  +--ro tapi-context?                tapi-common:uuid
-          |  +--ro token?                       string
-          |  +--ro full-log-record-offset-id* [value-name]
-          |  |  +--ro value-name    string
-          |  |  +--ro value?        string
-          |  +--ro log-append-time-stamp?       tapi-common:date-and-time
-          |  +--ro entity-key?                  string
-          |  +--ro record-type?                 record-type
-          |  +--ro record-authenticity-token?   string
-          +--ro log-record-body
-             +--ro event-time-stamp
-             |  +--ro primary-time-stamp?   tapi-common:date-and-time
-             |  +--ro start-time-stamp?     tapi-common:date-and-time
-             |  +--ro spread?               spread
-             |  +--ro source-precision?     source-precision
-             +--ro event-source?                        event-source
-             +--ro additional-event-info* [value-name]
-             |  +--ro value-name    string
-             |  +--ro value?        string
-             +--ro parent-address*                      string
-             +--ro record-content?                      object-class-identifier
-             +--rw condition-detector {tapi-streaming}?
-             |  +--ro condition-native-name?             string
-             |  +--ro measured-entity-uuid?              tapi-common:uuid
-             |  +--ro measured-entity-native-id?         string
-             |  +--ro condition-normalized-name?         string
-             |  +--ro measured-entity-class?             object-class-identifier
-             |  +--ro detector-uuid?                     tapi-common:uuid
-             |  +--ro detector-native-id?                string
-             |  +--ro condition-detector-type?           condition-detector-type
-             |  +--ro measured-entity-local-id*          string
-             |  +--ro alarm-condition-detector-detail {tapi-streaming}?
-             |     +--ro alarm-detector-state?   alarm-detector-state
-             |     +--ro legacy-properties
-             |        +--ro perceived-severity?      perceived-severity
-             |        +--ro service-affect?          service-affect
-             |        +--ro is-acknowledged?         boolean
-             |        +--ro additional-alarm-info*   string
-             +--ro service-interface-point {tapi-streaming}?
-             |  +--ro layer-protocol-name?                  layer-protocol-name
-             |  +--ro supported-layer-protocol-qualifier*   layer-protocol-qualifier
-             |  +--ro direction?                            port-direction
-             |  +--ro uuid?                                 uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?                 administrative-state
-             |  +--ro operational-state?                    operational-state
-             |  +--ro lifecycle-state?                      lifecycle-state
-             |  +--ro total-potential-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro available-capacity
-             |     +--ro total-size
-             |     |  +--ro value?   uint64
-             |     |  +--ro unit?    capacity-unit
-             |     +--ro bandwidth-profile
-             |        +--ro bw-profile-type?              bandwidth-profile-type
-             |        +--ro committed-information-rate
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro committed-burst-size
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro peak-information-rate
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro peak-burst-size
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro color-aware?                  boolean
-             |        +--ro coupling-flag?                boolean
-             +--ro any-class {tapi-streaming}?
-             +--ro stream-monitor {tapi-streaming-admin}?
-             |  +--ro id-of-last-record-read-from-log?    string
-             |  +--ro id-of-last-record-written-to-log?   string
-             |  +--ro available-stream
-             |  |  +--ro available-stream-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/available-stream/uuid
-             |  +--ro client-id?                          string
-             |  +--ro last-updated?                       tapi-common:date-and-time
-             |  +--ro client-address?                     string
-             |  +--ro uuid?                               uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro supported-stream-type {tapi-streaming}?
-             |  +--ro stream-type-name?       string
-             |  +--ro record-retention?       string
-             |  +--ro segment-size?           string
-             |  +--ro record-content*         object-class-identifier
-             |  +--ro log-storage-strategy?   log-storage-strategy
-             |  +--ro log-record-strategy?    log-record-strategy
-             |  +--ro uuid?                   uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro available-stream {tapi-streaming}?
-             |  +--ro connection-address?      string
-             |  +--ro stream-state?            stream-state
-             |  +--ro supported-stream-type
-             |  |  +--ro supported-stream-type-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/supported-stream-type/uuid
-             |  +--ro stream-id?               string
-             |  +--ro connection-protocol?     string
-             |  +--ro uuid?                    uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro connection {tapi-streaming}?
-             |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  +--ro lower-connection* [connection-uuid]
-             |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  +--ro supported-client-link* [topology-uuid link-uuid]
-             |  |  +--ro topology-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro link-uuid        -> /tapi-common:context/tapi-topology:topology-context/topology/link/uuid
-             |  +--ro route* [local-id]
-             |  |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  |  +--ro resilience-route-pac
-             |  |  |  +--ro priority?      uint64
-             |  |  |  +--ro route-state?   route-state
-             |  |  |  +--ro local-id?      string
-             |  |  |  +--ro name* [value-name]
-             |  |  |     +--ro value-name    string
-             |  |  |     +--ro value?        string
-             |  |  +--ro local-id                string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro switch-control* [uuid]
-             |  |  +--ro sub-switch-control* [connection-uuid switch-control-uuid]
-             |  |  |  +--ro connection-uuid        -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  |  |  +--ro switch-control-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/switch-control/uuid
-             |  |  +--ro switch* [local-id]
-             |  |  |  +--ro selected-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  |  |  +--ro selected-route* [connection-uuid route-local-id]
-             |  |  |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  |  |  |  +--ro route-local-id     -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/route/local-id
-             |  |  |  +--ro selection-control?               selection-control
-             |  |  |  +--ro selection-reason?                selection-reason
-             |  |  |  +--ro switch-direction?                tapi-common:port-direction
-             |  |  |  +--ro local-id                         string
-             |  |  |  +--ro name* [value-name]
-             |  |  |     +--ro value-name    string
-             |  |  |     +--ro value?        string
-             |  |  +--ro uuid                                  uuid
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro resilience-type
-             |  |  |  +--ro restoration-policy?   restoration-policy
-             |  |  |  +--ro protection-type?      protection-type
-             |  |  +--ro restoration-coordinate-type?          coordinate-type
-             |  |  +--ro restore-priority?                     uint64
-             |  |  +--ro reversion-mode?                       reversion-mode
-             |  |  +--ro wait-to-revert-time?                  uint64
-             |  |  +--ro hold-off-time?                        uint64
-             |  |  +--ro is-lock-out?                          boolean
-             |  |  +--ro is-frozen?                            boolean
-             |  |  +--ro is-coordinated-switching-both-ends?   boolean
-             |  |  +--ro max-switch-times?                     uint64
-             |  |  +--ro preferred-restoration-layer*          tapi-common:layer-protocol-name
-             |  +--ro direction?                   tapi-common:forwarding-direction
-             |  +--ro layer-protocol-name?         tapi-common:layer-protocol-name
-             |  +--ro connection-spec-reference
-             |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  +--ro connection-spec-name?   string
-             |  +--ro uuid?                        uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro operational-state?           operational-state
-             |  +--ro lifecycle-state?             lifecycle-state
-             +--ro connection-end-point {tapi-streaming}?
-             |  +--ro layer-protocol-name?               tapi-common:layer-protocol-name
-             |  +--ro layer-protocol-qualifier?          tapi-common:layer-protocol-qualifier
-             |  +--ro parent-node-edge-point
-             |  |  +--ro topology-uuid?          -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid?              -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  +--ro client-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  +--ro aggregated-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  +--ro connection-port-direction?         tapi-common:port-direction
-             |  +--ro connection-port-role?              tapi-common:port-role
-             |  +--ro cep-role* []
-             |  |  +--ro role-name?                   string
-             |  |  +--ro connection-spec-reference
-             |  |     +--ro connection-spec-id?     tapi-common:uuid
-             |  |     +--ro connection-spec-name?   string
-             |  +--ro uuid?                              uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro operational-state?                 operational-state
-             |  +--ro lifecycle-state?                   lifecycle-state
-             |  +--ro termination-direction?             termination-direction
-             |  +--ro termination-state?                 termination-state
-             +--ro connectivity-service {tapi-streaming}?
-             |  +--ro end-point* [local-id]
-             |  |  +--ro layer-protocol-name?                         tapi-common:layer-protocol-name
-             |  |  +--ro layer-protocol-qualifier?                    tapi-common:layer-protocol-qualifier
-             |  |  +--ro service-interface-point
-             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  |  +--ro capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro direction?                                   tapi-common:port-direction
-             |  |  +--ro role?                                        tapi-common:port-role
-             |  |  +--ro protection-role?                             protection-role
-             |  |  +--ro peer-fwd-connectivity-service-end-point
-             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  |  +--ro protecting-connectivity-service-end-point
-             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  |  +--ro server-connectivity-service-end-point
-             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  |  +--ro local-id                                     string
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro administrative-state?                        administrative-state
-             |  |  +--ro operational-state?                           operational-state
-             |  |  +--ro lifecycle-state?                             lifecycle-state
-             |  +--ro connection* [connection-uuid]
-             |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  +--ro uuid?                                 uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro service-layer?                        tapi-common:layer-protocol-name
-             |  +--ro service-type?                         service-type
-             |  +--ro service-level?                        string
-             |  +--ro requested-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro connectivity-direction?               tapi-common:forwarding-direction
-             |  +--ro schedule
-             |  |  +--ro end-time?     date-and-time
-             |  |  +--ro start-time?   date-and-time
-             |  +--ro coroute-inclusion
-             |  |  +--ro connectivity-service-uuid?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  +--ro diversity-exclusion* [connectivity-service-uuid]
-             |  |  +--ro connectivity-service-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  +--ro connection-exclusion*                 tapi-common:uuid
-             |  +--ro connection-inclusion*                 tapi-common:uuid
-             |  +--ro cost-characteristic* [cost-name]
-             |  |  +--ro cost-name         string
-             |  |  +--ro cost-value?       string
-             |  |  +--ro cost-algorithm?   string
-             |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  +--ro traffic-property-name            string
-             |  |  +--ro fixed-latency-characteristic?    string
-             |  |  +--ro queing-latency-characteristic?   string
-             |  |  +--ro jitter-characteristic?           string
-             |  |  +--ro wander-characteristic?           string
-             |  +--ro risk-diversity-characteristic* [risk-characteristic-name]
-             |  |  +--ro risk-characteristic-name    string
-             |  |  +--ro risk-identifier-list*       string
-             |  +--ro diversity-policy?                     diversity-policy
-             |  +--ro route-objective-function?             route-objective-function
-             |  +--ro route-direction?                      tapi-common:forwarding-direction
-             |  +--ro is-exclusive?                         boolean
-             |  +--ro max-allowed-cost
-             |  |  +--ro value?      uint64
-             |  |  +--ro priority?   uint64
-             |  +--ro max-allowed-hops
-             |  |  +--ro value?      uint64
-             |  |  +--ro priority?   uint64
-             |  +--ro max-allowed-delay
-             |  |  +--ro value?      uint64
-             |  |  +--ro priority?   uint64
-             |  +--ro include-topology*                     tapi-common:uuid
-             |  +--ro avoid-topology*                       tapi-common:uuid
-             |  +--ro include-path*                         tapi-common:uuid
-             |  +--ro exclude-path*                         tapi-common:uuid
-             |  +--ro include-link*                         tapi-common:uuid
-             |  +--ro exclude-link*                         tapi-common:uuid
-             |  +--ro include-node*                         tapi-common:uuid
-             |  +--ro exclude-node*                         tapi-common:uuid
-             |  +--ro preferred-transport-layer*            tapi-common:layer-protocol-name
-             |  +--ro resilience-type
-             |  |  +--ro restoration-policy?   restoration-policy
-             |  |  +--ro protection-type?      protection-type
-             |  +--ro restoration-coordinate-type?          coordinate-type
-             |  +--ro restore-priority?                     uint64
-             |  +--ro reversion-mode?                       reversion-mode
-             |  +--ro wait-to-revert-time?                  uint64
-             |  +--ro hold-off-time?                        uint64
-             |  +--ro is-lock-out?                          boolean
-             |  +--ro is-frozen?                            boolean
-             |  +--ro is-coordinated-switching-both-ends?   boolean
-             |  +--ro max-switch-times?                     uint64
-             |  +--ro preferred-restoration-layer*          tapi-common:layer-protocol-name
-             |  +--ro administrative-state?                 administrative-state
-             |  +--ro operational-state?                    operational-state
-             |  +--ro lifecycle-state?                      lifecycle-state
-             +--ro connectivity-service-end-point {tapi-streaming}?
-             |  +--ro layer-protocol-name?                         tapi-common:layer-protocol-name
-             |  +--ro layer-protocol-qualifier?                    tapi-common:layer-protocol-qualifier
-             |  +--ro service-interface-point
-             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  +--ro capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro direction?                                   tapi-common:port-direction
-             |  +--ro role?                                        tapi-common:port-role
-             |  +--ro protection-role?                             protection-role
-             |  +--ro peer-fwd-connectivity-service-end-point
-             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  +--ro protecting-connectivity-service-end-point
-             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  +--ro server-connectivity-service-end-point
-             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  +--ro local-id?                                    string
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?                        administrative-state
-             |  +--ro operational-state?                           operational-state
-             |  +--ro lifecycle-state?                             lifecycle-state
-             +--ro route {tapi-streaming}?
-             |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  +--ro resilience-route-pac
-             |  |  +--ro priority?      uint64
-             |  |  +--ro route-state?   route-state
-             |  |  +--ro local-id?      string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro local-id?               string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro switch {tapi-streaming}?
-             |  +--ro selected-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  +--ro selected-route* [connection-uuid route-local-id]
-             |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  |  +--ro route-local-id     -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/route/local-id
-             |  +--ro selection-control?               selection-control
-             |  +--ro selection-reason?                selection-reason
-             |  +--ro switch-direction?                tapi-common:port-direction
-             |  +--ro local-id?                        string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro switch-control {tapi-streaming}?
-             |  +--ro sub-switch-control* [connection-uuid switch-control-uuid]
-             |  |  +--ro connection-uuid        -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  |  +--ro switch-control-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/switch-control/uuid
-             |  +--ro switch* [local-id]
-             |  |  +--ro selected-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
-             |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
-             |  |  +--ro selected-route* [connection-uuid route-local-id]
-             |  |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
-             |  |  |  +--ro route-local-id     -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/route/local-id
-             |  |  +--ro selection-control?               selection-control
-             |  |  +--ro selection-reason?                selection-reason
-             |  |  +--ro switch-direction?                tapi-common:port-direction
-             |  |  +--ro local-id                         string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro uuid?                                 uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro resilience-type
-             |  |  +--ro restoration-policy?   restoration-policy
-             |  |  +--ro protection-type?      protection-type
-             |  +--ro restoration-coordinate-type?          coordinate-type
-             |  +--ro restore-priority?                     uint64
-             |  +--ro reversion-mode?                       reversion-mode
-             |  +--ro wait-to-revert-time?                  uint64
-             |  +--ro hold-off-time?                        uint64
-             |  +--ro is-lock-out?                          boolean
-             |  +--ro is-frozen?                            boolean
-             |  +--ro is-coordinated-switching-both-ends?   boolean
-             |  +--ro max-switch-times?                     uint64
-             |  +--ro preferred-restoration-layer*          tapi-common:layer-protocol-name
-             +--ro equipment {tapi-streaming}?
-             |  +--ro contained-holder* [uuid]
-             |  |  +--ro occupying-fru
-             |  |  |  +--ro device-uuid?      -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
-             |  |  |  +--ro equipment-uuid?   -> /tapi-common:context/tapi-equipment:physical-context/device/equipment/uuid
-             |  |  +--ro expected-holder
-             |  |  |  +--ro common-holder-properties
-             |  |  |     +--ro holder-category?   holder-category
-             |  |  |     +--ro is-guided?         boolean
-             |  |  |     +--ro holder-location?   string
-             |  |  +--ro actual-holder
-             |  |  |  +--ro common-holder-properties
-             |  |  |     +--ro holder-category?   holder-category
-             |  |  |     +--ro is-guided?         boolean
-             |  |  |     +--ro holder-location?   string
-             |  |  +--ro uuid               uuid
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro category?                      equipment-category
-             |  +--ro equipment-location?            string
-             |  +--ro geographical-location?         string
-             |  +--ro is-expected-actual-mismatch?   boolean
-             |  +--ro expected-equipment* []
-             |  |  +--ro expected-non-field-replaceable-module* []
-             |  |  |  +--ro common-equipment-properties
-             |  |  |     +--ro asset-type-identifier?        string
-             |  |  |     +--ro equipment-type-description?   string
-             |  |  |     +--ro equipment-type-identifier?    string
-             |  |  |     +--ro equipment-type-name?          string
-             |  |  |     +--ro equipment-type-version?       string
-             |  |  |     +--ro manufacturer-identifier?      string
-             |  |  |     +--ro manufacturer-name?            string
-             |  |  +--ro expected-holder* []
-             |  |  |  +--ro common-holder-properties
-             |  |  |     +--ro holder-category?   holder-category
-             |  |  |     +--ro is-guided?         boolean
-             |  |  |     +--ro holder-location?   string
-             |  |  +--ro common-equipment-properties
-             |  |     +--ro asset-type-identifier?        string
-             |  |     +--ro equipment-type-description?   string
-             |  |     +--ro equipment-type-identifier?    string
-             |  |     +--ro equipment-type-name?          string
-             |  |     +--ro equipment-type-version?       string
-             |  |     +--ro manufacturer-identifier?      string
-             |  |     +--ro manufacturer-name?            string
-             |  +--ro actual-equipment
-             |  |  +--ro actual-non-field-replaceable-module* []
-             |  |  |  +--ro common-actual-properties
-             |  |  |  |  +--ro asset-instance-identifier?   string
-             |  |  |  |  +--ro is-powered?                  boolean
-             |  |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
-             |  |  |  |  +--ro serial-number?               string
-             |  |  |  |  +--ro temperature?                 decimal64
-             |  |  |  +--ro common-equipment-properties
-             |  |  |     +--ro asset-type-identifier?        string
-             |  |  |     +--ro equipment-type-description?   string
-             |  |  |     +--ro equipment-type-identifier?    string
-             |  |  |     +--ro equipment-type-name?          string
-             |  |  |     +--ro equipment-type-version?       string
-             |  |  |     +--ro manufacturer-identifier?      string
-             |  |  |     +--ro manufacturer-name?            string
-             |  |  +--ro common-actual-properties
-             |  |  |  +--ro asset-instance-identifier?   string
-             |  |  |  +--ro is-powered?                  boolean
-             |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
-             |  |  |  +--ro serial-number?               string
-             |  |  |  +--ro temperature?                 decimal64
-             |  |  +--ro common-equipment-properties
-             |  |     +--ro asset-type-identifier?        string
-             |  |     +--ro equipment-type-description?   string
-             |  |     +--ro equipment-type-identifier?    string
-             |  |     +--ro equipment-type-name?          string
-             |  |     +--ro equipment-type-version?       string
-             |  |     +--ro manufacturer-identifier?      string
-             |  |     +--ro manufacturer-name?            string
-             |  +--ro uuid?                          uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro holder {tapi-streaming}?
-             |  +--ro occupying-fru
-             |  |  +--ro device-uuid?      -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
-             |  |  +--ro equipment-uuid?   -> /tapi-common:context/tapi-equipment:physical-context/device/equipment/uuid
-             |  +--ro expected-holder
-             |  |  +--ro common-holder-properties
-             |  |     +--ro holder-category?   holder-category
-             |  |     +--ro is-guided?         boolean
-             |  |     +--ro holder-location?   string
-             |  +--ro actual-holder
-             |  |  +--ro common-holder-properties
-             |  |     +--ro holder-category?   holder-category
-             |  |     +--ro is-guided?         boolean
-             |  |     +--ro holder-location?   string
-             |  +--ro uuid?              uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro access-port {tapi-streaming}?
-             |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
-             |  |  +--ro connector-identification    string
-             |  |  +--ro pin-identification          string
-             |  |  +--ro equipment-uuid              tapi-common:uuid
-             |  |  +--ro pin-and-role* []
-             |  |     +--ro location-in-connector?   string
-             |  |     +--ro pin-role*                string
-             |  |     +--ro pin-name?                string
-             |  +--ro uuid?            uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro abstract-strand {tapi-streaming}?
-             |  +--ro adjacent-strand* [physical-span-uuid abstract-strand-local-id]
-             |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
-             |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
-             |  +--ro spliced-strand* [physical-span-uuid abstract-strand-local-id]
-             |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
-             |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
-             |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
-             |  |  +--ro connector-identification    string
-             |  |  +--ro pin-identification          string
-             |  |  +--ro equipment-uuid              tapi-common:uuid
-             |  |  +--ro pin-and-role* []
-             |  |     +--ro location-in-connector?   string
-             |  |     +--ro pin-role*                string
-             |  |     +--ro pin-name?                string
-             |  +--ro strand-media-characteristics* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro local-id?                       string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro device {tapi-streaming}?
-             |  +--ro equipment* [uuid]
-             |  |  +--ro contained-holder* [uuid]
-             |  |  |  +--ro occupying-fru
-             |  |  |  |  +--ro device-uuid?      -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
-             |  |  |  |  +--ro equipment-uuid?   -> /tapi-common:context/tapi-equipment:physical-context/device/equipment/uuid
-             |  |  |  +--ro expected-holder
-             |  |  |  |  +--ro common-holder-properties
-             |  |  |  |     +--ro holder-category?   holder-category
-             |  |  |  |     +--ro is-guided?         boolean
-             |  |  |  |     +--ro holder-location?   string
-             |  |  |  +--ro actual-holder
-             |  |  |  |  +--ro common-holder-properties
-             |  |  |  |     +--ro holder-category?   holder-category
-             |  |  |  |     +--ro is-guided?         boolean
-             |  |  |  |     +--ro holder-location?   string
-             |  |  |  +--ro uuid               uuid
-             |  |  |  +--ro name* [value-name]
-             |  |  |     +--ro value-name    string
-             |  |  |     +--ro value?        string
-             |  |  +--ro category?                      equipment-category
-             |  |  +--ro equipment-location?            string
-             |  |  +--ro geographical-location?         string
-             |  |  +--ro is-expected-actual-mismatch?   boolean
-             |  |  +--ro expected-equipment* []
-             |  |  |  +--ro expected-non-field-replaceable-module* []
-             |  |  |  |  +--ro common-equipment-properties
-             |  |  |  |     +--ro asset-type-identifier?        string
-             |  |  |  |     +--ro equipment-type-description?   string
-             |  |  |  |     +--ro equipment-type-identifier?    string
-             |  |  |  |     +--ro equipment-type-name?          string
-             |  |  |  |     +--ro equipment-type-version?       string
-             |  |  |  |     +--ro manufacturer-identifier?      string
-             |  |  |  |     +--ro manufacturer-name?            string
-             |  |  |  +--ro expected-holder* []
-             |  |  |  |  +--ro common-holder-properties
-             |  |  |  |     +--ro holder-category?   holder-category
-             |  |  |  |     +--ro is-guided?         boolean
-             |  |  |  |     +--ro holder-location?   string
-             |  |  |  +--ro common-equipment-properties
-             |  |  |     +--ro asset-type-identifier?        string
-             |  |  |     +--ro equipment-type-description?   string
-             |  |  |     +--ro equipment-type-identifier?    string
-             |  |  |     +--ro equipment-type-name?          string
-             |  |  |     +--ro equipment-type-version?       string
-             |  |  |     +--ro manufacturer-identifier?      string
-             |  |  |     +--ro manufacturer-name?            string
-             |  |  +--ro actual-equipment
-             |  |  |  +--ro actual-non-field-replaceable-module* []
-             |  |  |  |  +--ro common-actual-properties
-             |  |  |  |  |  +--ro asset-instance-identifier?   string
-             |  |  |  |  |  +--ro is-powered?                  boolean
-             |  |  |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
-             |  |  |  |  |  +--ro serial-number?               string
-             |  |  |  |  |  +--ro temperature?                 decimal64
-             |  |  |  |  +--ro common-equipment-properties
-             |  |  |  |     +--ro asset-type-identifier?        string
-             |  |  |  |     +--ro equipment-type-description?   string
-             |  |  |  |     +--ro equipment-type-identifier?    string
-             |  |  |  |     +--ro equipment-type-name?          string
-             |  |  |  |     +--ro equipment-type-version?       string
-             |  |  |  |     +--ro manufacturer-identifier?      string
-             |  |  |  |     +--ro manufacturer-name?            string
-             |  |  |  +--ro common-actual-properties
-             |  |  |  |  +--ro asset-instance-identifier?   string
-             |  |  |  |  +--ro is-powered?                  boolean
-             |  |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
-             |  |  |  |  +--ro serial-number?               string
-             |  |  |  |  +--ro temperature?                 decimal64
-             |  |  |  +--ro common-equipment-properties
-             |  |  |     +--ro asset-type-identifier?        string
-             |  |  |     +--ro equipment-type-description?   string
-             |  |  |     +--ro equipment-type-identifier?    string
-             |  |  |     +--ro equipment-type-name?          string
-             |  |  |     +--ro equipment-type-version?       string
-             |  |  |     +--ro manufacturer-identifier?      string
-             |  |  |     +--ro manufacturer-name?            string
-             |  |  +--ro uuid                           uuid
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro access-port* [uuid]
-             |  |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
-             |  |  |  +--ro connector-identification    string
-             |  |  |  +--ro pin-identification          string
-             |  |  |  +--ro equipment-uuid              tapi-common:uuid
-             |  |  |  +--ro pin-and-role* []
-             |  |  |     +--ro location-in-connector?   string
-             |  |  |     +--ro pin-role*                string
-             |  |  |     +--ro pin-name?                string
-             |  |  +--ro uuid             uuid
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro uuid?          uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro physical-span {tapi-streaming}?
-             |  +--ro access-port* [device-uuid access-port-uuid]
-             |  |  +--ro device-uuid         -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
-             |  |  +--ro access-port-uuid    -> /tapi-common:context/tapi-equipment:physical-context/device/access-port/uuid
-             |  +--ro abstract-strand* [local-id]
-             |  |  +--ro adjacent-strand* [physical-span-uuid abstract-strand-local-id]
-             |  |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
-             |  |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
-             |  |  +--ro spliced-strand* [physical-span-uuid abstract-strand-local-id]
-             |  |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
-             |  |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
-             |  |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
-             |  |  |  +--ro connector-identification    string
-             |  |  |  +--ro pin-identification          string
-             |  |  |  +--ro equipment-uuid              tapi-common:uuid
-             |  |  |  +--ro pin-and-role* []
-             |  |  |     +--ro location-in-connector?   string
-             |  |  |     +--ro pin-role*                string
-             |  |  |     +--ro pin-name?                string
-             |  |  +--ro strand-media-characteristics* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro local-id                        string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro uuid?              uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro mep {tapi-streaming}?
-             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
-             |  +--ro direction?             tapi-common:termination-direction
-             |  +--ro mep-identifier?        string
-             |  +--ro peer-mep-identifier*   string
-             |  +--ro local-id?              string
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro operational-state?     operational-state
-             |  +--ro lifecycle-state?       lifecycle-state
-             +--ro oam-job {tapi-streaming}?
-             |  +--ro oam-service-end-point* [oam-service-uuid oam-service-end-point-local-id]
-             |  |  +--ro oam-service-uuid                  -> /tapi-common:context/tapi-oam:oam-context/oam-service/uuid
-             |  |  +--ro oam-service-end-point-local-id    -> /tapi-common:context/tapi-oam:oam-context/oam-service/end-point/local-id
-             |  +--ro oam-profile
-             |  |  +--ro oam-profile-uuid?   -> /tapi-common:context/tapi-oam:oam-context/oam-profile/uuid
-             |  +--ro pm-current-data* [local-id]
-             |  |  +--ro pm-history-data* [local-id]
-             |  |  |  +--ro granularity-period
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    time-unit
-             |  |  |  +--ro period-end-time?         tapi-common:date-and-time
-             |  |  |  +--ro suspect-interval-flag?   boolean
-             |  |  |  +--ro local-id                 string
-             |  |  |  +--ro name* [value-name]
-             |  |  |     +--ro value-name    string
-             |  |  |     +--ro value?        string
-             |  |  +--ro granularity-period
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    time-unit
-             |  |  +--ro timestamp?               tapi-common:date-and-time
-             |  |  +--ro elapsed-time
-             |  |  |  +--ro period* [unit]
-             |  |  |     +--ro value?   uint64
-             |  |  |     +--ro unit     time-unit
-             |  |  +--ro suspect-interval-flag?   boolean
-             |  |  +--ro local-id                 string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro oam-job-type?            oam-job-type
-             |  +--ro schedule
-             |  |  +--ro end-time?     date-and-time
-             |  |  +--ro start-time?   date-and-time
-             |  +--ro creation-time?           tapi-common:date-and-time
-             |  +--ro uuid?                    uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?    administrative-state
-             |  +--ro operational-state?       operational-state
-             |  +--ro lifecycle-state?         lifecycle-state
-             +--ro meg {tapi-streaming}?
-             |  +--ro mep* [local-id]
-             |  |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
-             |  |  +--ro direction?             tapi-common:termination-direction
-             |  |  +--ro mep-identifier?        string
-             |  |  +--ro peer-mep-identifier*   string
-             |  |  +--ro local-id               string
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro operational-state?     operational-state
-             |  |  +--ro lifecycle-state?       lifecycle-state
-             |  +--ro mip* [local-id]
-             |  |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
-             |  |  +--ro local-id               string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
-             |  +--ro direction?             tapi-common:forwarding-direction
-             |  +--ro meg-level?             uint64
-             |  +--ro meg-identifier?        string
-             |  +--ro uuid?                  uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro operational-state?     operational-state
-             |  +--ro lifecycle-state?       lifecycle-state
-             +--ro mip {tapi-streaming}?
-             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
-             |  +--ro local-id?              string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro oam-service {tapi-streaming}?
-             |  +--ro end-point* [local-id]
-             |  |  +--ro service-interface-point
-             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro connectivity-service-end-point
-             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  |  +--ro mep
-             |  |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
-             |  |  |  +--ro mep-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id
-             |  |  +--ro mip
-             |  |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
-             |  |  |  +--ro mip-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id
-             |  |  +--ro layer-protocol-name?              tapi-common:layer-protocol-name
-             |  |  +--ro direction?                        tapi-common:port-direction
-             |  |  +--ro mep-identifier?                   string
-             |  |  +--ro peer-mep-identifier*              string
-             |  |  +--ro local-id                          string
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro administrative-state?             administrative-state
-             |  |  +--ro operational-state?                operational-state
-             |  |  +--ro lifecycle-state?                  lifecycle-state
-             |  +--ro meg
-             |  |  +--ro meg-uuid?   -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
-             |  +--ro oam-profile
-             |  |  +--ro oam-profile-uuid?   -> /tapi-common:context/tapi-oam:oam-context/oam-profile/uuid
-             |  +--ro uuid?                   uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?   administrative-state
-             |  +--ro operational-state?      operational-state
-             |  +--ro lifecycle-state?        lifecycle-state
-             |  +--ro layer-protocol-name?    tapi-common:layer-protocol-name
-             |  +--ro direction?              tapi-common:forwarding-direction
-             |  +--ro meg-level?              uint64
-             +--ro oam-service-end-point {tapi-streaming}?
-             |  +--ro service-interface-point
-             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  +--ro connectivity-service-end-point
-             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
-             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
-             |  +--ro mep
-             |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
-             |  |  +--ro mep-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id
-             |  +--ro mip
-             |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
-             |  |  +--ro mip-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id
-             |  +--ro layer-protocol-name?              tapi-common:layer-protocol-name
-             |  +--ro direction?                        tapi-common:port-direction
-             |  +--ro mep-identifier?                   string
-             |  +--ro peer-mep-identifier*              string
-             |  +--ro local-id?                         string
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?             administrative-state
-             |  +--ro operational-state?                operational-state
-             |  +--ro lifecycle-state?                  lifecycle-state
-             +--ro pm-current-data {tapi-streaming}?
-             |  +--ro pm-history-data* [local-id]
-             |  |  +--ro granularity-period
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    time-unit
-             |  |  +--ro period-end-time?         tapi-common:date-and-time
-             |  |  +--ro suspect-interval-flag?   boolean
-             |  |  +--ro local-id                 string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro granularity-period
-             |  |  +--ro value?   uint64
-             |  |  +--ro unit?    time-unit
-             |  +--ro timestamp?               tapi-common:date-and-time
-             |  +--ro elapsed-time
-             |  |  +--ro period* [unit]
-             |  |     +--ro value?   uint64
-             |  |     +--ro unit     time-unit
-             |  +--ro suspect-interval-flag?   boolean
-             |  +--ro local-id?                string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro pm-history-data {tapi-streaming}?
-             |  +--ro granularity-period
-             |  |  +--ro value?   uint64
-             |  |  +--ro unit?    time-unit
-             |  +--ro period-end-time?         tapi-common:date-and-time
-             |  +--ro suspect-interval-flag?   boolean
-             |  +--ro local-id?                string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro oam-profile {tapi-streaming}?
-             |  +--ro pm-threshold-data* [local-id]
-             |  |  +--ro granularity-period
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    time-unit
-             |  |  +--ro is-transient?         boolean
-             |  |  +--ro local-id              string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro pm-bin-data* [local-id]
-             |  |  +--ro granularity-period
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    time-unit
-             |  |  +--ro local-id              string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro uuid?                uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro pm-threshold-data {tapi-streaming}?
-             |  +--ro granularity-period
-             |  |  +--ro value?   uint64
-             |  |  +--ro unit?    time-unit
-             |  +--ro is-transient?         boolean
-             |  +--ro local-id?             string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro pm-bin-data {tapi-streaming}?
-             |  +--ro granularity-period
-             |  |  +--ro value?   uint64
-             |  |  +--ro unit?    time-unit
-             |  +--ro local-id?             string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro path {tapi-streaming}?
-             |  +--ro link* [topology-uuid link-uuid]
-             |  |  +--ro topology-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro link-uuid        -> /tapi-common:context/tapi-topology:topology-context/topology/link/uuid
-             |  +--ro routing-constraint
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  +--ro traffic-property-name            string
-             |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  +--ro wander-characteristic?           string
-             |  |  +--ro risk-diversity-characteristic* [risk-characteristic-name]
-             |  |  |  +--ro risk-characteristic-name    string
-             |  |  |  +--ro risk-identifier-list*       string
-             |  |  +--ro diversity-policy?                diversity-policy
-             |  |  +--ro route-objective-function?        route-objective-function
-             |  |  +--ro route-direction?                 tapi-common:forwarding-direction
-             |  |  +--ro is-exclusive?                    boolean
-             |  |  +--ro max-allowed-cost
-             |  |  |  +--ro value?      uint64
-             |  |  |  +--ro priority?   uint64
-             |  |  +--ro max-allowed-hops
-             |  |  |  +--ro value?      uint64
-             |  |  |  +--ro priority?   uint64
-             |  |  +--ro max-allowed-delay
-             |  |     +--ro value?      uint64
-             |  |     +--ro priority?   uint64
-             |  +--ro direction?             tapi-common:forwarding-direction
-             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
-             |  +--ro uuid?                  uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro path-computation-service {tapi-streaming}?
-             |  +--ro path* [path-uuid]
-             |  |  +--ro path-uuid    -> /tapi-common:context/tapi-path-computation:path-computation-context/path/uuid
-             |  +--ro end-point* [local-id]
-             |  |  +--ro service-interface-point
-             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro layer-protocol-name?        tapi-common:layer-protocol-name
-             |  |  +--ro layer-protocol-qualifier?   tapi-common:layer-protocol-qualifier
-             |  |  +--ro capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro role?                       tapi-common:port-role
-             |  |  +--ro direction?                  tapi-common:port-direction
-             |  |  +--ro local-id                    string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro routing-constraint
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  +--ro traffic-property-name            string
-             |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  +--ro wander-characteristic?           string
-             |  |  +--ro risk-diversity-characteristic* [risk-characteristic-name]
-             |  |  |  +--ro risk-characteristic-name    string
-             |  |  |  +--ro risk-identifier-list*       string
-             |  |  +--ro diversity-policy?                diversity-policy
-             |  |  +--ro route-objective-function?        route-objective-function
-             |  |  +--ro route-direction?                 tapi-common:forwarding-direction
-             |  |  +--ro is-exclusive?                    boolean
-             |  |  +--ro max-allowed-cost
-             |  |  |  +--ro value?      uint64
-             |  |  |  +--ro priority?   uint64
-             |  |  +--ro max-allowed-hops
-             |  |  |  +--ro value?      uint64
-             |  |  |  +--ro priority?   uint64
-             |  |  +--ro max-allowed-delay
-             |  |     +--ro value?      uint64
-             |  |     +--ro priority?   uint64
-             |  +--ro topology-constraint
-             |  |  +--ro include-topology*            tapi-common:uuid
-             |  |  +--ro avoid-topology*              tapi-common:uuid
-             |  |  +--ro include-path*                tapi-common:uuid
-             |  |  +--ro exclude-path*                tapi-common:uuid
-             |  |  +--ro include-link*                tapi-common:uuid
-             |  |  +--ro exclude-link*                tapi-common:uuid
-             |  |  +--ro include-node*                tapi-common:uuid
-             |  |  +--ro exclude-node*                tapi-common:uuid
-             |  |  +--ro preferred-transport-layer*   tapi-common:layer-protocol-name
-             |  +--ro objective-function
-             |  |  +--ro bandwidth-optimization?   tapi-common:directive-value
-             |  |  +--ro concurrent-paths?         tapi-common:directive-value
-             |  |  +--ro cost-optimization?        tapi-common:directive-value
-             |  |  +--ro link-utilization?         tapi-common:directive-value
-             |  |  +--ro resource-sharing?         tapi-common:directive-value
-             |  |  +--ro local-id?                 string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro optimization-constraint
-             |  |  +--ro traffic-interruption?   tapi-common:directive-value
-             |  |  +--ro local-id?               string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro uuid?                      uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro path-service-end-point {tapi-streaming}?
-             |  +--ro service-interface-point
-             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  +--ro layer-protocol-name?        tapi-common:layer-protocol-name
-             |  +--ro layer-protocol-qualifier?   tapi-common:layer-protocol-qualifier
-             |  +--ro capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro role?                       tapi-common:port-role
-             |  +--ro direction?                  tapi-common:port-direction
-             |  +--ro local-id?                   string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro path-optimization-constraint {tapi-streaming}?
-             |  +--ro traffic-interruption?   tapi-common:directive-value
-             |  +--ro local-id?               string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro path-objective-function {tapi-streaming}?
-             |  +--ro bandwidth-optimization?   tapi-common:directive-value
-             |  +--ro concurrent-paths?         tapi-common:directive-value
-             |  +--ro cost-optimization?        tapi-common:directive-value
-             |  +--ro link-utilization?         tapi-common:directive-value
-             |  +--ro resource-sharing?         tapi-common:directive-value
-             |  +--ro local-id?                 string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro link {tapi-streaming}?
-             |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
-             |  +--ro direction?                                 tapi-common:forwarding-direction
-             |  +--ro resilience-type
-             |  |  +--ro restoration-policy?   restoration-policy
-             |  |  +--ro protection-type?      protection-type
-             |  +--ro uuid?                                      uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?                      administrative-state
-             |  +--ro operational-state?                         operational-state
-             |  +--ro lifecycle-state?                           lifecycle-state
-             |  +--ro total-potential-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro available-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro cost-characteristic* [cost-name]
-             |  |  +--ro cost-name         string
-             |  |  +--ro cost-value?       string
-             |  |  +--ro cost-algorithm?   string
-             |  +--ro error-characteristic?                      string
-             |  +--ro loss-characteristic?                       string
-             |  +--ro repeat-delivery-characteristic?            string
-             |  +--ro delivery-order-characteristic?             string
-             |  +--ro unavailable-time-characteristic?           string
-             |  +--ro server-integrity-process-characteristic?   string
-             |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  +--ro traffic-property-name            string
-             |  |  +--ro fixed-latency-characteristic?    string
-             |  |  +--ro queing-latency-characteristic?   string
-             |  |  +--ro jitter-characteristic?           string
-             |  |  +--ro wander-characteristic?           string
-             |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |  +--ro risk-characteristic-name    string
-             |  |  +--ro risk-identifier-list*       string
-             |  +--ro validation-mechanism* [validation-mechanism]
-             |  |  +--ro validation-mechanism                  string
-             |  |  +--ro layer-protocol-adjacency-validated?   string
-             |  |  +--ro validation-robustness?                string
-             |  +--ro transitioned-layer-protocol-name*          string
-             +--ro node {tapi-streaming}?
-             |  +--ro owned-node-edge-point* [uuid]
-             |  |  +--ro layer-protocol-name?                      tapi-common:layer-protocol-name
-             |  |  +--ro supported-cep-layer-protocol-qualifier*   tapi-common:layer-protocol-qualifier
-             |  |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro mapped-service-interface-point* [service-interface-point-uuid]
-             |  |  |  +--ro service-interface-point-uuid    -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro link-port-direction?                      tapi-common:port-direction
-             |  |  +--ro link-port-role?                           tapi-common:port-role
-             |  |  +--ro uuid                                      uuid
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro administrative-state?                     administrative-state
-             |  |  +--ro operational-state?                        operational-state
-             |  |  +--ro lifecycle-state?                          lifecycle-state
-             |  |  +--ro termination-direction?                    termination-direction
-             |  |  +--ro termination-state?                        termination-state
-             |  |  +--ro total-potential-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro available-capacity
-             |  |     +--ro total-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro bandwidth-profile
-             |  |        +--ro bw-profile-type?              bandwidth-profile-type
-             |  |        +--ro committed-information-rate
-             |  |        |  +--ro value?   uint64
-             |  |        |  +--ro unit?    capacity-unit
-             |  |        +--ro committed-burst-size
-             |  |        |  +--ro value?   uint64
-             |  |        |  +--ro unit?    capacity-unit
-             |  |        +--ro peak-information-rate
-             |  |        |  +--ro value?   uint64
-             |  |        |  +--ro unit?    capacity-unit
-             |  |        +--ro peak-burst-size
-             |  |        |  +--ro value?   uint64
-             |  |        |  +--ro unit?    capacity-unit
-             |  |        +--ro color-aware?                  boolean
-             |  |        +--ro coupling-flag?                boolean
-             |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  +--ro node-rule-group* [uuid]
-             |  |  +--ro rule* [local-id]
-             |  |  |  +--ro rule-type?                   rule-type
-             |  |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  |  +--ro override-priority?           uint64
-             |  |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  |  +--ro cep-port-role* []
-             |  |  |  |  +--ro port-role*        port-role
-             |  |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  |  +--ro connection-spec-reference* []
-             |  |  |  |  +--ro connection-spec-name?   string
-             |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  |  +--ro signal-property
-             |  |  |  |  +--ro signal-property-name?         string
-             |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  |  +--ro complex-rule*                string
-             |  |  |  +--ro local-id                     string
-             |  |  |  +--ro name* [value-name]
-             |  |  |     +--ro value-name    string
-             |  |  |     +--ro value?        string
-             |  |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  |  +--ro inter-rule-group* [uuid]
-             |  |  |  +--ro rule* [local-id]
-             |  |  |  |  +--ro rule-type?                   rule-type
-             |  |  |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  |  |  +--ro override-priority?           uint64
-             |  |  |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  |  |  +--ro cep-port-role* []
-             |  |  |  |  |  +--ro port-role*        port-role
-             |  |  |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  |  |  +--ro connection-spec-reference* []
-             |  |  |  |  |  +--ro connection-spec-name?   string
-             |  |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  |  |  +--ro signal-property
-             |  |  |  |  |  +--ro signal-property-name?         string
-             |  |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  |  |  +--ro complex-rule*                string
-             |  |  |  |  +--ro local-id                     string
-             |  |  |  |  +--ro name* [value-name]
-             |  |  |  |     +--ro value-name    string
-             |  |  |  |     +--ro value?        string
-             |  |  |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  |  |  +--ro uuid                          uuid
-             |  |  |  +--ro name* [value-name]
-             |  |  |  |  +--ro value-name    string
-             |  |  |  |  +--ro value?        string
-             |  |  |  +--ro total-potential-capacity
-             |  |  |  |  +--ro total-size
-             |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |     +--ro committed-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro committed-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  +--ro available-capacity
-             |  |  |  |  +--ro total-size
-             |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |     +--ro committed-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro committed-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  |  +--ro cost-name         string
-             |  |  |  |  +--ro cost-value?       string
-             |  |  |  |  +--ro cost-algorithm?   string
-             |  |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  |  +--ro traffic-property-name            string
-             |  |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  |  +--ro wander-characteristic?           string
-             |  |  |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |  |     +--ro risk-characteristic-name    string
-             |  |  |     +--ro risk-identifier-list*       string
-             |  |  +--ro uuid                        uuid
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro total-potential-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro available-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  +--ro traffic-property-name            string
-             |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  +--ro wander-characteristic?           string
-             |  |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |     +--ro risk-characteristic-name    string
-             |  |     +--ro risk-identifier-list*       string
-             |  +--ro encap-topology
-             |  |  +--ro topology-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
-             |  +--ro uuid?                                      uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?                      administrative-state
-             |  +--ro operational-state?                         operational-state
-             |  +--ro lifecycle-state?                           lifecycle-state
-             |  +--ro total-potential-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro available-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro cost-characteristic* [cost-name]
-             |  |  +--ro cost-name         string
-             |  |  +--ro cost-value?       string
-             |  |  +--ro cost-algorithm?   string
-             |  +--ro error-characteristic?                      string
-             |  +--ro loss-characteristic?                       string
-             |  +--ro repeat-delivery-characteristic?            string
-             |  +--ro delivery-order-characteristic?             string
-             |  +--ro unavailable-time-characteristic?           string
-             |  +--ro server-integrity-process-characteristic?   string
-             |  +--ro latency-characteristic* [traffic-property-name]
-             |     +--ro traffic-property-name            string
-             |     +--ro fixed-latency-characteristic?    string
-             |     +--ro queing-latency-characteristic?   string
-             |     +--ro jitter-characteristic?           string
-             |     +--ro wander-characteristic?           string
-             +--ro topology {tapi-streaming}?
-             |  +--ro node* [uuid]
-             |  |  +--ro owned-node-edge-point* [uuid]
-             |  |  |  +--ro layer-protocol-name?                      tapi-common:layer-protocol-name
-             |  |  |  +--ro supported-cep-layer-protocol-qualifier*   tapi-common:layer-protocol-qualifier
-             |  |  |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  |  +--ro mapped-service-interface-point* [service-interface-point-uuid]
-             |  |  |  |  +--ro service-interface-point-uuid    -> /tapi-common:context/service-interface-point/uuid
-             |  |  |  +--ro link-port-direction?                      tapi-common:port-direction
-             |  |  |  +--ro link-port-role?                           tapi-common:port-role
-             |  |  |  +--ro uuid                                      uuid
-             |  |  |  +--ro name* [value-name]
-             |  |  |  |  +--ro value-name    string
-             |  |  |  |  +--ro value?        string
-             |  |  |  +--ro administrative-state?                     administrative-state
-             |  |  |  +--ro operational-state?                        operational-state
-             |  |  |  +--ro lifecycle-state?                          lifecycle-state
-             |  |  |  +--ro termination-direction?                    termination-direction
-             |  |  |  +--ro termination-state?                        termination-state
-             |  |  |  +--ro total-potential-capacity
-             |  |  |  |  +--ro total-size
-             |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |     +--ro committed-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro committed-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  +--ro available-capacity
-             |  |  |     +--ro total-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro bandwidth-profile
-             |  |  |        +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |        +--ro committed-information-rate
-             |  |  |        |  +--ro value?   uint64
-             |  |  |        |  +--ro unit?    capacity-unit
-             |  |  |        +--ro committed-burst-size
-             |  |  |        |  +--ro value?   uint64
-             |  |  |        |  +--ro unit?    capacity-unit
-             |  |  |        +--ro peak-information-rate
-             |  |  |        |  +--ro value?   uint64
-             |  |  |        |  +--ro unit?    capacity-unit
-             |  |  |        +--ro peak-burst-size
-             |  |  |        |  +--ro value?   uint64
-             |  |  |        |  +--ro unit?    capacity-unit
-             |  |  |        +--ro color-aware?                  boolean
-             |  |  |        +--ro coupling-flag?                boolean
-             |  |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro node-rule-group* [uuid]
-             |  |  |  +--ro rule* [local-id]
-             |  |  |  |  +--ro rule-type?                   rule-type
-             |  |  |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  |  |  +--ro override-priority?           uint64
-             |  |  |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  |  |  +--ro cep-port-role* []
-             |  |  |  |  |  +--ro port-role*        port-role
-             |  |  |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  |  |  +--ro connection-spec-reference* []
-             |  |  |  |  |  +--ro connection-spec-name?   string
-             |  |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  |  |  +--ro signal-property
-             |  |  |  |  |  +--ro signal-property-name?         string
-             |  |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  |  |  +--ro complex-rule*                string
-             |  |  |  |  +--ro local-id                     string
-             |  |  |  |  +--ro name* [value-name]
-             |  |  |  |     +--ro value-name    string
-             |  |  |  |     +--ro value?        string
-             |  |  |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  |  +--ro node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  |  |  +--ro inter-rule-group* [uuid]
-             |  |  |  |  +--ro rule* [local-id]
-             |  |  |  |  |  +--ro rule-type?                   rule-type
-             |  |  |  |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  |  |  |  +--ro override-priority?           uint64
-             |  |  |  |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  |  |  |  +--ro cep-port-role* []
-             |  |  |  |  |  |  +--ro port-role*        port-role
-             |  |  |  |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  |  |  |  +--ro connection-spec-reference* []
-             |  |  |  |  |  |  +--ro connection-spec-name?   string
-             |  |  |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  |  |  |  +--ro signal-property
-             |  |  |  |  |  |  +--ro signal-property-name?         string
-             |  |  |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  |  |  |  +--ro complex-rule*                string
-             |  |  |  |  |  +--ro local-id                     string
-             |  |  |  |  |  +--ro name* [value-name]
-             |  |  |  |  |     +--ro value-name    string
-             |  |  |  |  |     +--ro value?        string
-             |  |  |  |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  |  |  |  +--ro uuid                          uuid
-             |  |  |  |  +--ro name* [value-name]
-             |  |  |  |  |  +--ro value-name    string
-             |  |  |  |  |  +--ro value?        string
-             |  |  |  |  +--ro total-potential-capacity
-             |  |  |  |  |  +--ro total-size
-             |  |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |  |     +--ro committed-information-rate
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro committed-burst-size
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro peak-information-rate
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro peak-burst-size
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  |  +--ro available-capacity
-             |  |  |  |  |  +--ro total-size
-             |  |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |  |     +--ro committed-information-rate
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro committed-burst-size
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro peak-information-rate
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro peak-burst-size
-             |  |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  |  |  +--ro cost-name         string
-             |  |  |  |  |  +--ro cost-value?       string
-             |  |  |  |  |  +--ro cost-algorithm?   string
-             |  |  |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  |  |  +--ro traffic-property-name            string
-             |  |  |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  |  |  +--ro wander-characteristic?           string
-             |  |  |  |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |  |  |     +--ro risk-characteristic-name    string
-             |  |  |  |     +--ro risk-identifier-list*       string
-             |  |  |  +--ro uuid                        uuid
-             |  |  |  +--ro name* [value-name]
-             |  |  |  |  +--ro value-name    string
-             |  |  |  |  +--ro value?        string
-             |  |  |  +--ro total-potential-capacity
-             |  |  |  |  +--ro total-size
-             |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |     +--ro committed-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro committed-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  +--ro available-capacity
-             |  |  |  |  +--ro total-size
-             |  |  |  |  |  +--ro value?   uint64
-             |  |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  |  +--ro bandwidth-profile
-             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |  |     +--ro committed-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro committed-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-information-rate
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro peak-burst-size
-             |  |  |  |     |  +--ro value?   uint64
-             |  |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |  |     +--ro color-aware?                  boolean
-             |  |  |  |     +--ro coupling-flag?                boolean
-             |  |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  |  +--ro cost-name         string
-             |  |  |  |  +--ro cost-value?       string
-             |  |  |  |  +--ro cost-algorithm?   string
-             |  |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  |  +--ro traffic-property-name            string
-             |  |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  |  +--ro wander-characteristic?           string
-             |  |  |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |  |     +--ro risk-characteristic-name    string
-             |  |  |     +--ro risk-identifier-list*       string
-             |  |  +--ro encap-topology
-             |  |  |  +--ro topology-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
-             |  |  +--ro uuid                                       uuid
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro administrative-state?                      administrative-state
-             |  |  +--ro operational-state?                         operational-state
-             |  |  +--ro lifecycle-state?                           lifecycle-state
-             |  |  +--ro total-potential-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro available-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro error-characteristic?                      string
-             |  |  +--ro loss-characteristic?                       string
-             |  |  +--ro repeat-delivery-characteristic?            string
-             |  |  +--ro delivery-order-characteristic?             string
-             |  |  +--ro unavailable-time-characteristic?           string
-             |  |  +--ro server-integrity-process-characteristic?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |     +--ro traffic-property-name            string
-             |  |     +--ro fixed-latency-characteristic?    string
-             |  |     +--ro queing-latency-characteristic?   string
-             |  |     +--ro jitter-characteristic?           string
-             |  |     +--ro wander-characteristic?           string
-             |  +--ro link* [uuid]
-             |  |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
-             |  |  +--ro direction?                                 tapi-common:forwarding-direction
-             |  |  +--ro resilience-type
-             |  |  |  +--ro restoration-policy?   restoration-policy
-             |  |  |  +--ro protection-type?      protection-type
-             |  |  +--ro uuid                                       uuid
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro administrative-state?                      administrative-state
-             |  |  +--ro operational-state?                         operational-state
-             |  |  +--ro lifecycle-state?                           lifecycle-state
-             |  |  +--ro total-potential-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro available-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro error-characteristic?                      string
-             |  |  +--ro loss-characteristic?                       string
-             |  |  +--ro repeat-delivery-characteristic?            string
-             |  |  +--ro delivery-order-characteristic?             string
-             |  |  +--ro unavailable-time-characteristic?           string
-             |  |  +--ro server-integrity-process-characteristic?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  +--ro traffic-property-name            string
-             |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  +--ro wander-characteristic?           string
-             |  |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |  |  +--ro risk-characteristic-name    string
-             |  |  |  +--ro risk-identifier-list*       string
-             |  |  +--ro validation-mechanism* [validation-mechanism]
-             |  |  |  +--ro validation-mechanism                  string
-             |  |  |  +--ro layer-protocol-adjacency-validated?   string
-             |  |  |  +--ro validation-robustness?                string
-             |  |  +--ro transitioned-layer-protocol-name*          string
-             |  +--ro layer-protocol-name*   tapi-common:layer-protocol-name
-             |  +--ro uuid?                  uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro node-edge-point {tapi-streaming}?
-             |  +--ro layer-protocol-name?                      tapi-common:layer-protocol-name
-             |  +--ro supported-cep-layer-protocol-qualifier*   tapi-common:layer-protocol-qualifier
-             |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  +--ro mapped-service-interface-point* [service-interface-point-uuid]
-             |  |  +--ro service-interface-point-uuid    -> /tapi-common:context/service-interface-point/uuid
-             |  +--ro link-port-direction?                      tapi-common:port-direction
-             |  +--ro link-port-role?                           tapi-common:port-role
-             |  +--ro uuid?                                     uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro administrative-state?                     administrative-state
-             |  +--ro operational-state?                        operational-state
-             |  +--ro lifecycle-state?                          lifecycle-state
-             |  +--ro termination-direction?                    termination-direction
-             |  +--ro termination-state?                        termination-state
-             |  +--ro total-potential-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro available-capacity
-             |     +--ro total-size
-             |     |  +--ro value?   uint64
-             |     |  +--ro unit?    capacity-unit
-             |     +--ro bandwidth-profile
-             |        +--ro bw-profile-type?              bandwidth-profile-type
-             |        +--ro committed-information-rate
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro committed-burst-size
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro peak-information-rate
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro peak-burst-size
-             |        |  +--ro value?   uint64
-             |        |  +--ro unit?    capacity-unit
-             |        +--ro color-aware?                  boolean
-             |        +--ro coupling-flag?                boolean
-             +--ro rule {tapi-streaming}?
-             |  +--ro rule-type?                   rule-type
-             |  +--ro forwarding-rule?             forwarding-rule
-             |  +--ro override-priority?           uint64
-             |  +--ro cep-direction*               tapi-common:port-direction
-             |  +--ro cep-port-role* []
-             |  |  +--ro port-role*        port-role
-             |  |  +--ro port-role-rule*   port-role-rule-option
-             |  +--ro connection-spec-reference* []
-             |  |  +--ro connection-spec-name?   string
-             |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  +--ro signal-property
-             |  |  +--ro signal-property-name?         string
-             |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  +--ro applicable-signal-value*      string
-             |  |  +--ro number-of-signal-values?      uint64
-             |  +--ro complex-rule*                string
-             |  +--ro local-id?                    string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro node-rule-group {tapi-streaming}?
-             |  +--ro rule* [local-id]
-             |  |  +--ro rule-type?                   rule-type
-             |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  +--ro override-priority?           uint64
-             |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  +--ro cep-port-role* []
-             |  |  |  +--ro port-role*        port-role
-             |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  +--ro connection-spec-reference* []
-             |  |  |  +--ro connection-spec-name?   string
-             |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  +--ro signal-property
-             |  |  |  +--ro signal-property-name?         string
-             |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  +--ro complex-rule*                string
-             |  |  +--ro local-id                     string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
-             |  +--ro node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  +--ro inter-rule-group* [uuid]
-             |  |  +--ro rule* [local-id]
-             |  |  |  +--ro rule-type?                   rule-type
-             |  |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  |  +--ro override-priority?           uint64
-             |  |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  |  +--ro cep-port-role* []
-             |  |  |  |  +--ro port-role*        port-role
-             |  |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  |  +--ro connection-spec-reference* []
-             |  |  |  |  +--ro connection-spec-name?   string
-             |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  |  +--ro signal-property
-             |  |  |  |  +--ro signal-property-name?         string
-             |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  |  +--ro complex-rule*                string
-             |  |  |  +--ro local-id                     string
-             |  |  |  +--ro name* [value-name]
-             |  |  |     +--ro value-name    string
-             |  |  |     +--ro value?        string
-             |  |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  |  +--ro uuid                          uuid
-             |  |  +--ro name* [value-name]
-             |  |  |  +--ro value-name    string
-             |  |  |  +--ro value?        string
-             |  |  +--ro total-potential-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro available-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  +--ro traffic-property-name            string
-             |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  +--ro wander-characteristic?           string
-             |  |  +--ro risk-characteristic* [risk-characteristic-name]
-             |  |     +--ro risk-characteristic-name    string
-             |  |     +--ro risk-identifier-list*       string
-             |  +--ro uuid?                       uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro total-potential-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro available-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro cost-characteristic* [cost-name]
-             |  |  +--ro cost-name         string
-             |  |  +--ro cost-value?       string
-             |  |  +--ro cost-algorithm?   string
-             |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  +--ro traffic-property-name            string
-             |  |  +--ro fixed-latency-characteristic?    string
-             |  |  +--ro queing-latency-characteristic?   string
-             |  |  +--ro jitter-characteristic?           string
-             |  |  +--ro wander-characteristic?           string
-             |  +--ro risk-characteristic* [risk-characteristic-name]
-             |     +--ro risk-characteristic-name    string
-             |     +--ro risk-identifier-list*       string
-             +--ro inter-rule-group {tapi-streaming}?
-             |  +--ro rule* [local-id]
-             |  |  +--ro rule-type?                   rule-type
-             |  |  +--ro forwarding-rule?             forwarding-rule
-             |  |  +--ro override-priority?           uint64
-             |  |  +--ro cep-direction*               tapi-common:port-direction
-             |  |  +--ro cep-port-role* []
-             |  |  |  +--ro port-role*        port-role
-             |  |  |  +--ro port-role-rule*   port-role-rule-option
-             |  |  +--ro connection-spec-reference* []
-             |  |  |  +--ro connection-spec-name?   string
-             |  |  |  +--ro connection-spec-id?     tapi-common:uuid
-             |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
-             |  |  +--ro signal-property
-             |  |  |  +--ro signal-property-name?         string
-             |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
-             |  |  |  +--ro applicable-signal-value*      string
-             |  |  |  +--ro number-of-signal-values?      uint64
-             |  |  +--ro complex-rule*                string
-             |  |  +--ro local-id                     string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
-             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
-             |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
-             |  +--ro uuid?                         uuid
-             |  +--ro name* [value-name]
-             |  |  +--ro value-name    string
-             |  |  +--ro value?        string
-             |  +--ro total-potential-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro available-capacity
-             |  |  +--ro total-size
-             |  |  |  +--ro value?   uint64
-             |  |  |  +--ro unit?    capacity-unit
-             |  |  +--ro bandwidth-profile
-             |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |     +--ro committed-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro committed-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-information-rate
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro peak-burst-size
-             |  |     |  +--ro value?   uint64
-             |  |     |  +--ro unit?    capacity-unit
-             |  |     +--ro color-aware?                  boolean
-             |  |     +--ro coupling-flag?                boolean
-             |  +--ro cost-characteristic* [cost-name]
-             |  |  +--ro cost-name         string
-             |  |  +--ro cost-value?       string
-             |  |  +--ro cost-algorithm?   string
-             |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  +--ro traffic-property-name            string
-             |  |  +--ro fixed-latency-characteristic?    string
-             |  |  +--ro queing-latency-characteristic?   string
-             |  |  +--ro jitter-characteristic?           string
-             |  |  +--ro wander-characteristic?           string
-             |  +--ro risk-characteristic* [risk-characteristic-name]
-             |     +--ro risk-characteristic-name    string
-             |     +--ro risk-identifier-list*       string
-             +--ro network-topology-service {tapi-streaming}?
-             |  +--ro topology* [topology-uuid]
-             |  |  +--ro topology-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  +--ro uuid?       uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro virtual-network-service {tapi-streaming}?
-             |  +--ro topology
-             |  |  +--ro topology-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
-             |  +--ro end-point* [local-id]
-             |  |  +--ro service-interface-point
-             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro role?                      tapi-common:port-role
-             |  |  +--ro direction?                 tapi-common:port-direction
-             |  |  +--ro service-layer?             tapi-common:layer-protocol-name
-             |  |  +--ro local-id                   string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro vnw-constraint* [local-id]
-             |  |  +--ro src-service-end-point
-             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro sink-service-end-point
-             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  |  +--ro diversity-exclusion* [virtual-nw-service-uuid]
-             |  |  |  +--ro virtual-nw-service-uuid    -> /tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service/uuid
-             |  |  +--ro requested-capacity
-             |  |  |  +--ro total-size
-             |  |  |  |  +--ro value?   uint64
-             |  |  |  |  +--ro unit?    capacity-unit
-             |  |  |  +--ro bandwidth-profile
-             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
-             |  |  |     +--ro committed-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro committed-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-information-rate
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro peak-burst-size
-             |  |  |     |  +--ro value?   uint64
-             |  |  |     |  +--ro unit?    capacity-unit
-             |  |  |     +--ro color-aware?                  boolean
-             |  |  |     +--ro coupling-flag?                boolean
-             |  |  +--ro service-level?            string
-             |  |  +--ro service-layer*            tapi-common:layer-protocol-name
-             |  |  +--ro cost-characteristic* [cost-name]
-             |  |  |  +--ro cost-name         string
-             |  |  |  +--ro cost-value?       string
-             |  |  |  +--ro cost-algorithm?   string
-             |  |  +--ro latency-characteristic* [traffic-property-name]
-             |  |  |  +--ro traffic-property-name            string
-             |  |  |  +--ro fixed-latency-characteristic?    string
-             |  |  |  +--ro queing-latency-characteristic?   string
-             |  |  |  +--ro jitter-characteristic?           string
-             |  |  |  +--ro wander-characteristic?           string
-             |  |  +--ro local-id                  string
-             |  |  +--ro name* [value-name]
-             |  |     +--ro value-name    string
-             |  |     +--ro value?        string
-             |  +--ro schedule?              string
-             |  +--ro state
-             |  |  +--ro administrative-state?   administrative-state
-             |  |  +--ro operational-state?      operational-state
-             |  |  +--ro lifecycle-state?        lifecycle-state
-             |  +--ro layer-protocol-name*   tapi-common:layer-protocol-name
-             |  +--ro uuid?                  uuid
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro virtual-network-service-end-point {tapi-streaming}?
-             |  +--ro service-interface-point
-             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-             |  +--ro role?                      tapi-common:port-role
-             |  +--ro direction?                 tapi-common:port-direction
-             |  +--ro service-layer?             tapi-common:layer-protocol-name
-             |  +--ro local-id?                  string
-             |  +--ro name* [value-name]
-             |     +--ro value-name    string
-             |     +--ro value?        string
-             +--ro virtual-network-constraint {tapi-streaming}?
-                +--ro src-service-end-point
-                |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-                +--ro sink-service-end-point
-                |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
-                +--ro diversity-exclusion* [virtual-nw-service-uuid]
-                |  +--ro virtual-nw-service-uuid    -> /tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service/uuid
-                +--ro requested-capacity
-                |  +--ro total-size
-                |  |  +--ro value?   uint64
-                |  |  +--ro unit?    capacity-unit
-                |  +--ro bandwidth-profile
-                |     +--ro bw-profile-type?              bandwidth-profile-type
-                |     +--ro committed-information-rate
-                |     |  +--ro value?   uint64
-                |     |  +--ro unit?    capacity-unit
-                |     +--ro committed-burst-size
-                |     |  +--ro value?   uint64
-                |     |  +--ro unit?    capacity-unit
-                |     +--ro peak-information-rate
-                |     |  +--ro value?   uint64
-                |     |  +--ro unit?    capacity-unit
-                |     +--ro peak-burst-size
-                |     |  +--ro value?   uint64
-                |     |  +--ro unit?    capacity-unit
-                |     +--ro color-aware?                  boolean
-                |     +--ro coupling-flag?                boolean
-                +--ro service-level?            string
-                +--ro service-layer*            tapi-common:layer-protocol-name
-                +--ro cost-characteristic* [cost-name]
-                |  +--ro cost-name         string
-                |  +--ro cost-value?       string
-                |  +--ro cost-algorithm?   string
-                +--ro latency-characteristic* [traffic-property-name]
-                |  +--ro traffic-property-name            string
-                |  +--ro fixed-latency-characteristic?    string
-                |  +--ro queing-latency-characteristic?   string
-                |  +--ro jitter-characteristic?           string
-                |  +--ro wander-characteristic?           string
-                +--ro local-id?                 string
-                +--ro name* [value-name]
-                   +--ro value-name    string
-                   +--ro value?        string
+
+module: tapi-streaming
+  augment /tapi-common:context:
+    +--rw stream-admin-context {tapi-streaming-admin}?
+       +--ro stream-monitor* [uuid]
+       |  +--ro id-of-last-record-read-from-log?    string
+       |  +--ro id-of-last-record-written-to-log?   string
+       |  +--ro available-stream
+       |  |  +--ro available-stream-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/available-stream/uuid
+       |  +--ro client-id?                          string
+       |  +--ro last-updated?                       tapi-common:date-and-time
+       |  +--ro client-address?                     string
+       |  +--ro uuid                                uuid
+       |  +--ro name* [value-name]
+       |     +--ro value-name    string
+       |     +--ro value?        string
+       +--rw uuid?             uuid
+       +--rw name* [value-name]
+          +--rw value-name    string
+          +--rw value?        string
+  augment /tapi-common:context:
+    +--rw stream-context {tapi-streaming}?
+       +--ro available-stream* [uuid]
+       |  +--ro connection-address?      string
+       |  +--ro stream-state?            stream-state
+       |  +--ro supported-stream-type
+       |  |  +--ro supported-stream-type-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/supported-stream-type/uuid
+       |  +--ro stream-id?               string
+       |  +--ro connection-protocol?     string
+       |  +--ro uuid                     uuid
+       |  +--ro name* [value-name]
+       |     +--ro value-name    string
+       |     +--ro value?        string
+       +--ro supported-stream-type* [uuid]
+          +--ro stream-type-name?              string
+          +--ro record-retention?              string
+          +--ro segment-size?                  string
+          +--ro record-content*                object-class-identifier
+          +--ro log-storage-strategy?          log-storage-strategy
+          +--ro log-record-strategy?           log-record-strategy
+          +--ro uuid                           uuid
+          +--ro name* [value-name]
+          |  +--ro value-name    string
+          |  +--ro value?        string
+          +--rw compacted-log-details {tapi-streaming}?
+          |  +--ro tombstone-retention?   string
+          |  +--ro compaction-delay?      string
+          +--ro connection-protocol-details {tapi-streaming}?
+             +--ro allowed-connection-protocols*   string
+
+  rpcs:
+    +---x connect-to-stream
+    |  +---w input
+    |     +---w start-from-token?     string
+    |     +---w connection-address?   string
+    +---x get-available-stream-connection-details
+    |  +--ro output
+    |     +--ro active-connections* []
+    |        +--ro connection-address?      string
+    |        +--ro stream-state?            stream-state
+    |        +--ro supported-stream-type
+    |        |  +--ro supported-stream-type-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/supported-stream-type/uuid
+    |        +--ro stream-id?               string
+    |        +--ro connection-protocol?     string
+    |        +--ro uuid?                    uuid
+    |        +--ro name* [value-name]
+    |           +--ro value-name    string
+    |           +--ro value?        string
+    +---x get-supported-stream-connection-types
+       +--ro output
+          +--ro supported-stream-types* []
+             +--ro stream-type-name?       string
+             +--ro record-retention?       string
+             +--ro segment-size?           string
+             +--ro record-content*         object-class-identifier
+             +--ro log-storage-strategy?   log-storage-strategy
+             +--ro log-record-strategy?    log-record-strategy
+             +--ro uuid?                   uuid
+             +--ro name* [value-name]
+                +--ro value-name    string
+                +--ro value?        string
+
+  notifications:
+    +---n stream-record
+       +--ro log-record* []
+          +--ro log-record-header
+          |  +--ro tapi-context?                tapi-common:uuid
+          |  +--ro token?                       string
+          |  +--ro full-log-record-offset-id* [value-name]
+          |  |  +--ro value-name    string
+          |  |  +--ro value?        string
+          |  +--ro log-append-time-stamp?       tapi-common:date-and-time
+          |  +--ro entity-key?                  string
+          |  +--ro record-type?                 record-type
+          |  +--ro record-authenticity-token?   string
+          +--ro log-record-body
+             +--ro event-time-stamp
+             |  +--ro primary-time-stamp?   tapi-common:date-and-time
+             |  +--ro start-time-stamp?     tapi-common:date-and-time
+             |  +--ro spread?               spread
+             |  +--ro source-precision?     source-precision
+             +--ro event-source?                        event-source
+             +--ro additional-event-info* [value-name]
+             |  +--ro value-name    string
+             |  +--ro value?        string
+             +--ro parent-address*                      string
+             +--ro record-content?                      object-class-identifier
+             +--rw condition-detector {tapi-streaming}?
+             |  +--ro condition-native-name?             string
+             |  +--ro measured-entity-uuid?              tapi-common:uuid
+             |  +--ro measured-entity-native-id?         string
+             |  +--ro condition-normalized-name?         string
+             |  +--ro measured-entity-class?             object-class-identifier
+             |  +--ro detector-uuid?                     tapi-common:uuid
+             |  +--ro detector-native-id?                string
+             |  +--ro condition-detector-type?           condition-detector-type
+             |  +--ro measured-entity-local-id*          string
+             |  +--ro alarm-condition-detector-detail {tapi-streaming}?
+             |     +--ro alarm-detector-state?   alarm-detector-state
+             |     +--ro legacy-properties
+             |        +--ro perceived-severity?      perceived-severity
+             |        +--ro service-affect?          service-affect
+             |        +--ro is-acknowledged?         boolean
+             |        +--ro additional-alarm-info*   string
+             +--ro service-interface-point {tapi-streaming}?
+             |  +--ro layer-protocol-name?                  layer-protocol-name
+             |  +--ro supported-layer-protocol-qualifier*   layer-protocol-qualifier
+             |  +--ro direction?                            port-direction
+             |  +--ro uuid?                                 uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?                 administrative-state
+             |  +--ro operational-state?                    operational-state
+             |  +--ro lifecycle-state?                      lifecycle-state
+             |  +--ro total-potential-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro available-capacity
+             |     +--ro total-size
+             |     |  +--ro value?   uint64
+             |     |  +--ro unit?    capacity-unit
+             |     +--ro bandwidth-profile
+             |        +--ro bw-profile-type?              bandwidth-profile-type
+             |        +--ro committed-information-rate
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro committed-burst-size
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro peak-information-rate
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro peak-burst-size
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro color-aware?                  boolean
+             |        +--ro coupling-flag?                boolean
+             +--ro any-class {tapi-streaming}?
+             +--ro stream-monitor {tapi-streaming-admin}?
+             |  +--ro id-of-last-record-read-from-log?    string
+             |  +--ro id-of-last-record-written-to-log?   string
+             |  +--ro available-stream
+             |  |  +--ro available-stream-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/available-stream/uuid
+             |  +--ro client-id?                          string
+             |  +--ro last-updated?                       tapi-common:date-and-time
+             |  +--ro client-address?                     string
+             |  +--ro uuid?                               uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro supported-stream-type {tapi-streaming}?
+             |  +--ro stream-type-name?       string
+             |  +--ro record-retention?       string
+             |  +--ro segment-size?           string
+             |  +--ro record-content*         object-class-identifier
+             |  +--ro log-storage-strategy?   log-storage-strategy
+             |  +--ro log-record-strategy?    log-record-strategy
+             |  +--ro uuid?                   uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro available-stream {tapi-streaming}?
+             |  +--ro connection-address?      string
+             |  +--ro stream-state?            stream-state
+             |  +--ro supported-stream-type
+             |  |  +--ro supported-stream-type-uuid?   -> /tapi-common:context/tapi-streaming:stream-context/supported-stream-type/uuid
+             |  +--ro stream-id?               string
+             |  +--ro connection-protocol?     string
+             |  +--ro uuid?                    uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro connection {tapi-streaming}?
+             |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  +--ro lower-connection* [connection-uuid]
+             |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  +--ro supported-client-link* [topology-uuid link-uuid]
+             |  |  +--ro topology-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro link-uuid        -> /tapi-common:context/tapi-topology:topology-context/topology/link/uuid
+             |  +--ro route* [local-id]
+             |  |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  |  +--ro resilience-route-pac
+             |  |  |  +--ro priority?      uint64
+             |  |  |  +--ro route-state?   route-state
+             |  |  |  +--ro local-id?      string
+             |  |  |  +--ro name* [value-name]
+             |  |  |     +--ro value-name    string
+             |  |  |     +--ro value?        string
+             |  |  +--ro local-id                string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro switch-control* [uuid]
+             |  |  +--ro sub-switch-control* [connection-uuid switch-control-uuid]
+             |  |  |  +--ro connection-uuid        -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  |  |  +--ro switch-control-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/switch-control/uuid
+             |  |  +--ro switch* [local-id]
+             |  |  |  +--ro selected-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  |  |  +--ro selected-route* [connection-uuid route-local-id]
+             |  |  |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  |  |  |  +--ro route-local-id     -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/route/local-id
+             |  |  |  +--ro selection-control?               selection-control
+             |  |  |  +--ro selection-reason?                selection-reason
+             |  |  |  +--ro switch-direction?                tapi-common:port-direction
+             |  |  |  +--ro local-id                         string
+             |  |  |  +--ro name* [value-name]
+             |  |  |     +--ro value-name    string
+             |  |  |     +--ro value?        string
+             |  |  +--ro uuid                                  uuid
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro resilience-type
+             |  |  |  +--ro restoration-policy?   restoration-policy
+             |  |  |  +--ro protection-type?      protection-type
+             |  |  +--ro restoration-coordinate-type?          coordinate-type
+             |  |  +--ro restore-priority?                     uint64
+             |  |  +--ro reversion-mode?                       reversion-mode
+             |  |  +--ro wait-to-revert-time?                  uint64
+             |  |  +--ro hold-off-time?                        uint64
+             |  |  +--ro is-lock-out?                          boolean
+             |  |  +--ro is-frozen?                            boolean
+             |  |  +--ro is-coordinated-switching-both-ends?   boolean
+             |  |  +--ro max-switch-times?                     uint64
+             |  |  +--ro preferred-restoration-layer*          tapi-common:layer-protocol-name
+             |  +--ro direction?                   tapi-common:forwarding-direction
+             |  +--ro layer-protocol-name?         tapi-common:layer-protocol-name
+             |  +--ro connection-spec-reference
+             |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  +--ro connection-spec-name?   string
+             |  +--ro uuid?                        uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro operational-state?           operational-state
+             |  +--ro lifecycle-state?             lifecycle-state
+             +--ro connection-end-point {tapi-streaming}?
+             |  +--ro layer-protocol-name?               tapi-common:layer-protocol-name
+             |  +--ro layer-protocol-qualifier?          tapi-common:layer-protocol-qualifier
+             |  +--ro parent-node-edge-point
+             |  |  +--ro topology-uuid?          -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid?              -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  +--ro client-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  +--ro aggregated-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  +--ro connection-port-direction?         tapi-common:port-direction
+             |  +--ro connection-port-role?              tapi-common:port-role
+             |  +--ro cep-role* []
+             |  |  +--ro role-name?                   string
+             |  |  +--ro connection-spec-reference
+             |  |     +--ro connection-spec-id?     tapi-common:uuid
+             |  |     +--ro connection-spec-name?   string
+             |  +--ro uuid?                              uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro operational-state?                 operational-state
+             |  +--ro lifecycle-state?                   lifecycle-state
+             |  +--ro termination-direction?             termination-direction
+             |  +--ro termination-state?                 termination-state
+             +--ro connectivity-service {tapi-streaming}?
+             |  +--ro end-point* [local-id]
+             |  |  +--ro layer-protocol-name?                         tapi-common:layer-protocol-name
+             |  |  +--ro layer-protocol-qualifier?                    tapi-common:layer-protocol-qualifier
+             |  |  +--ro service-interface-point
+             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  |  +--ro capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro direction?                                   tapi-common:port-direction
+             |  |  +--ro role?                                        tapi-common:port-role
+             |  |  +--ro protection-role?                             protection-role
+             |  |  +--ro peer-fwd-connectivity-service-end-point
+             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  |  +--ro protecting-connectivity-service-end-point
+             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  |  +--ro server-connectivity-service-end-point
+             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  |  +--ro local-id                                     string
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro administrative-state?                        administrative-state
+             |  |  +--ro operational-state?                           operational-state
+             |  |  +--ro lifecycle-state?                             lifecycle-state
+             |  +--ro connection* [connection-uuid]
+             |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  +--ro uuid?                                 uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro service-layer?                        tapi-common:layer-protocol-name
+             |  +--ro service-type?                         service-type
+             |  +--ro service-level?                        string
+             |  +--ro requested-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro connectivity-direction?               tapi-common:forwarding-direction
+             |  +--ro schedule
+             |  |  +--ro end-time?     date-and-time
+             |  |  +--ro start-time?   date-and-time
+             |  +--ro coroute-inclusion
+             |  |  +--ro connectivity-service-uuid?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  +--ro diversity-exclusion* [connectivity-service-uuid]
+             |  |  +--ro connectivity-service-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  +--ro connection-exclusion*                 tapi-common:uuid
+             |  +--ro connection-inclusion*                 tapi-common:uuid
+             |  +--ro cost-characteristic* [cost-name]
+             |  |  +--ro cost-name         string
+             |  |  +--ro cost-value?       string
+             |  |  +--ro cost-algorithm?   string
+             |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  +--ro traffic-property-name            string
+             |  |  +--ro fixed-latency-characteristic?    string
+             |  |  +--ro queing-latency-characteristic?   string
+             |  |  +--ro jitter-characteristic?           string
+             |  |  +--ro wander-characteristic?           string
+             |  +--ro risk-diversity-characteristic* [risk-characteristic-name]
+             |  |  +--ro risk-characteristic-name    string
+             |  |  +--ro risk-identifier-list*       string
+             |  +--ro diversity-policy?                     diversity-policy
+             |  +--ro route-objective-function?             route-objective-function
+             |  +--ro route-direction?                      tapi-common:forwarding-direction
+             |  +--ro is-exclusive?                         boolean
+             |  +--ro max-allowed-cost
+             |  |  +--ro value?      uint64
+             |  |  +--ro priority?   uint64
+             |  +--ro max-allowed-hops
+             |  |  +--ro value?      uint64
+             |  |  +--ro priority?   uint64
+             |  +--ro max-allowed-delay
+             |  |  +--ro value?      uint64
+             |  |  +--ro priority?   uint64
+             |  +--ro include-topology*                     tapi-common:uuid
+             |  +--ro avoid-topology*                       tapi-common:uuid
+             |  +--ro include-path*                         tapi-common:uuid
+             |  +--ro exclude-path*                         tapi-common:uuid
+             |  +--ro include-link*                         tapi-common:uuid
+             |  +--ro exclude-link*                         tapi-common:uuid
+             |  +--ro include-node*                         tapi-common:uuid
+             |  +--ro exclude-node*                         tapi-common:uuid
+             |  +--ro preferred-transport-layer*            tapi-common:layer-protocol-name
+             |  +--ro resilience-type
+             |  |  +--ro restoration-policy?   restoration-policy
+             |  |  +--ro protection-type?      protection-type
+             |  +--ro restoration-coordinate-type?          coordinate-type
+             |  +--ro restore-priority?                     uint64
+             |  +--ro reversion-mode?                       reversion-mode
+             |  +--ro wait-to-revert-time?                  uint64
+             |  +--ro hold-off-time?                        uint64
+             |  +--ro is-lock-out?                          boolean
+             |  +--ro is-frozen?                            boolean
+             |  +--ro is-coordinated-switching-both-ends?   boolean
+             |  +--ro max-switch-times?                     uint64
+             |  +--ro preferred-restoration-layer*          tapi-common:layer-protocol-name
+             |  +--ro administrative-state?                 administrative-state
+             |  +--ro operational-state?                    operational-state
+             |  +--ro lifecycle-state?                      lifecycle-state
+             +--ro connectivity-service-end-point {tapi-streaming}?
+             |  +--ro layer-protocol-name?                         tapi-common:layer-protocol-name
+             |  +--ro layer-protocol-qualifier?                    tapi-common:layer-protocol-qualifier
+             |  +--ro service-interface-point
+             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  +--ro capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro direction?                                   tapi-common:port-direction
+             |  +--ro role?                                        tapi-common:port-role
+             |  +--ro protection-role?                             protection-role
+             |  +--ro peer-fwd-connectivity-service-end-point
+             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  +--ro protecting-connectivity-service-end-point
+             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  +--ro server-connectivity-service-end-point
+             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  +--ro local-id?                                    string
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?                        administrative-state
+             |  +--ro operational-state?                           operational-state
+             |  +--ro lifecycle-state?                             lifecycle-state
+             +--ro route {tapi-streaming}?
+             |  +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  +--ro resilience-route-pac
+             |  |  +--ro priority?      uint64
+             |  |  +--ro route-state?   route-state
+             |  |  +--ro local-id?      string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro local-id?               string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro switch {tapi-streaming}?
+             |  +--ro selected-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  +--ro selected-route* [connection-uuid route-local-id]
+             |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  |  +--ro route-local-id     -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/route/local-id
+             |  +--ro selection-control?               selection-control
+             |  +--ro selection-reason?                selection-reason
+             |  +--ro switch-direction?                tapi-common:port-direction
+             |  +--ro local-id?                        string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro switch-control {tapi-streaming}?
+             |  +--ro sub-switch-control* [connection-uuid switch-control-uuid]
+             |  |  +--ro connection-uuid        -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  |  +--ro switch-control-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/switch-control/uuid
+             |  +--ro switch* [local-id]
+             |  |  +--ro selected-connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid]
+             |  |  |  +--ro topology-uuid                -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid                    -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid         -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  |  +--ro connection-end-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/tapi-connectivity:cep-list/connection-end-point/uuid
+             |  |  +--ro selected-route* [connection-uuid route-local-id]
+             |  |  |  +--ro connection-uuid    -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/uuid
+             |  |  |  +--ro route-local-id     -> /tapi-common:context/tapi-connectivity:connectivity-context/connection/route/local-id
+             |  |  +--ro selection-control?               selection-control
+             |  |  +--ro selection-reason?                selection-reason
+             |  |  +--ro switch-direction?                tapi-common:port-direction
+             |  |  +--ro local-id                         string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro uuid?                                 uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro resilience-type
+             |  |  +--ro restoration-policy?   restoration-policy
+             |  |  +--ro protection-type?      protection-type
+             |  +--ro restoration-coordinate-type?          coordinate-type
+             |  +--ro restore-priority?                     uint64
+             |  +--ro reversion-mode?                       reversion-mode
+             |  +--ro wait-to-revert-time?                  uint64
+             |  +--ro hold-off-time?                        uint64
+             |  +--ro is-lock-out?                          boolean
+             |  +--ro is-frozen?                            boolean
+             |  +--ro is-coordinated-switching-both-ends?   boolean
+             |  +--ro max-switch-times?                     uint64
+             |  +--ro preferred-restoration-layer*          tapi-common:layer-protocol-name
+             +--ro equipment {tapi-streaming}?
+             |  +--ro contained-holder* [uuid]
+             |  |  +--ro occupying-fru
+             |  |  |  +--ro device-uuid?      -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
+             |  |  |  +--ro equipment-uuid?   -> /tapi-common:context/tapi-equipment:physical-context/device/equipment/uuid
+             |  |  +--ro expected-holder
+             |  |  |  +--ro common-holder-properties
+             |  |  |     +--ro holder-category?   holder-category
+             |  |  |     +--ro is-guided?         boolean
+             |  |  |     +--ro holder-location?   string
+             |  |  +--ro actual-holder
+             |  |  |  +--ro common-holder-properties
+             |  |  |     +--ro holder-category?   holder-category
+             |  |  |     +--ro is-guided?         boolean
+             |  |  |     +--ro holder-location?   string
+             |  |  +--ro uuid               uuid
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro category?                      equipment-category
+             |  +--ro equipment-location?            string
+             |  +--ro geographical-location?         string
+             |  +--ro is-expected-actual-mismatch?   boolean
+             |  +--ro expected-equipment* []
+             |  |  +--ro expected-non-field-replaceable-module* []
+             |  |  |  +--ro common-equipment-properties
+             |  |  |     +--ro asset-type-identifier?        string
+             |  |  |     +--ro equipment-type-description?   string
+             |  |  |     +--ro equipment-type-identifier?    string
+             |  |  |     +--ro equipment-type-name?          string
+             |  |  |     +--ro equipment-type-version?       string
+             |  |  |     +--ro manufacturer-identifier?      string
+             |  |  |     +--ro manufacturer-name?            string
+             |  |  +--ro expected-holder* []
+             |  |  |  +--ro common-holder-properties
+             |  |  |     +--ro holder-category?   holder-category
+             |  |  |     +--ro is-guided?         boolean
+             |  |  |     +--ro holder-location?   string
+             |  |  +--ro common-equipment-properties
+             |  |     +--ro asset-type-identifier?        string
+             |  |     +--ro equipment-type-description?   string
+             |  |     +--ro equipment-type-identifier?    string
+             |  |     +--ro equipment-type-name?          string
+             |  |     +--ro equipment-type-version?       string
+             |  |     +--ro manufacturer-identifier?      string
+             |  |     +--ro manufacturer-name?            string
+             |  +--ro actual-equipment
+             |  |  +--ro actual-non-field-replaceable-module* []
+             |  |  |  +--ro common-actual-properties
+             |  |  |  |  +--ro asset-instance-identifier?   string
+             |  |  |  |  +--ro is-powered?                  boolean
+             |  |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
+             |  |  |  |  +--ro serial-number?               string
+             |  |  |  |  +--ro temperature?                 decimal64
+             |  |  |  +--ro common-equipment-properties
+             |  |  |     +--ro asset-type-identifier?        string
+             |  |  |     +--ro equipment-type-description?   string
+             |  |  |     +--ro equipment-type-identifier?    string
+             |  |  |     +--ro equipment-type-name?          string
+             |  |  |     +--ro equipment-type-version?       string
+             |  |  |     +--ro manufacturer-identifier?      string
+             |  |  |     +--ro manufacturer-name?            string
+             |  |  +--ro common-actual-properties
+             |  |  |  +--ro asset-instance-identifier?   string
+             |  |  |  +--ro is-powered?                  boolean
+             |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
+             |  |  |  +--ro serial-number?               string
+             |  |  |  +--ro temperature?                 decimal64
+             |  |  +--ro common-equipment-properties
+             |  |     +--ro asset-type-identifier?        string
+             |  |     +--ro equipment-type-description?   string
+             |  |     +--ro equipment-type-identifier?    string
+             |  |     +--ro equipment-type-name?          string
+             |  |     +--ro equipment-type-version?       string
+             |  |     +--ro manufacturer-identifier?      string
+             |  |     +--ro manufacturer-name?            string
+             |  +--ro uuid?                          uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro holder {tapi-streaming}?
+             |  +--ro occupying-fru
+             |  |  +--ro device-uuid?      -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
+             |  |  +--ro equipment-uuid?   -> /tapi-common:context/tapi-equipment:physical-context/device/equipment/uuid
+             |  +--ro expected-holder
+             |  |  +--ro common-holder-properties
+             |  |     +--ro holder-category?   holder-category
+             |  |     +--ro is-guided?         boolean
+             |  |     +--ro holder-location?   string
+             |  +--ro actual-holder
+             |  |  +--ro common-holder-properties
+             |  |     +--ro holder-category?   holder-category
+             |  |     +--ro is-guided?         boolean
+             |  |     +--ro holder-location?   string
+             |  +--ro uuid?              uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro access-port {tapi-streaming}?
+             |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
+             |  |  +--ro connector-identification    string
+             |  |  +--ro pin-identification          string
+             |  |  +--ro equipment-uuid              tapi-common:uuid
+             |  |  +--ro pin-and-role* []
+             |  |     +--ro location-in-connector?   string
+             |  |     +--ro pin-role*                string
+             |  |     +--ro pin-name?                string
+             |  +--ro uuid?            uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro abstract-strand {tapi-streaming}?
+             |  +--ro adjacent-strand* [physical-span-uuid abstract-strand-local-id]
+             |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
+             |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
+             |  +--ro spliced-strand* [physical-span-uuid abstract-strand-local-id]
+             |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
+             |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
+             |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
+             |  |  +--ro connector-identification    string
+             |  |  +--ro pin-identification          string
+             |  |  +--ro equipment-uuid              tapi-common:uuid
+             |  |  +--ro pin-and-role* []
+             |  |     +--ro location-in-connector?   string
+             |  |     +--ro pin-role*                string
+             |  |     +--ro pin-name?                string
+             |  +--ro strand-media-characteristics* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro local-id?                       string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro device {tapi-streaming}?
+             |  +--ro equipment* [uuid]
+             |  |  +--ro contained-holder* [uuid]
+             |  |  |  +--ro occupying-fru
+             |  |  |  |  +--ro device-uuid?      -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
+             |  |  |  |  +--ro equipment-uuid?   -> /tapi-common:context/tapi-equipment:physical-context/device/equipment/uuid
+             |  |  |  +--ro expected-holder
+             |  |  |  |  +--ro common-holder-properties
+             |  |  |  |     +--ro holder-category?   holder-category
+             |  |  |  |     +--ro is-guided?         boolean
+             |  |  |  |     +--ro holder-location?   string
+             |  |  |  +--ro actual-holder
+             |  |  |  |  +--ro common-holder-properties
+             |  |  |  |     +--ro holder-category?   holder-category
+             |  |  |  |     +--ro is-guided?         boolean
+             |  |  |  |     +--ro holder-location?   string
+             |  |  |  +--ro uuid               uuid
+             |  |  |  +--ro name* [value-name]
+             |  |  |     +--ro value-name    string
+             |  |  |     +--ro value?        string
+             |  |  +--ro category?                      equipment-category
+             |  |  +--ro equipment-location?            string
+             |  |  +--ro geographical-location?         string
+             |  |  +--ro is-expected-actual-mismatch?   boolean
+             |  |  +--ro expected-equipment* []
+             |  |  |  +--ro expected-non-field-replaceable-module* []
+             |  |  |  |  +--ro common-equipment-properties
+             |  |  |  |     +--ro asset-type-identifier?        string
+             |  |  |  |     +--ro equipment-type-description?   string
+             |  |  |  |     +--ro equipment-type-identifier?    string
+             |  |  |  |     +--ro equipment-type-name?          string
+             |  |  |  |     +--ro equipment-type-version?       string
+             |  |  |  |     +--ro manufacturer-identifier?      string
+             |  |  |  |     +--ro manufacturer-name?            string
+             |  |  |  +--ro expected-holder* []
+             |  |  |  |  +--ro common-holder-properties
+             |  |  |  |     +--ro holder-category?   holder-category
+             |  |  |  |     +--ro is-guided?         boolean
+             |  |  |  |     +--ro holder-location?   string
+             |  |  |  +--ro common-equipment-properties
+             |  |  |     +--ro asset-type-identifier?        string
+             |  |  |     +--ro equipment-type-description?   string
+             |  |  |     +--ro equipment-type-identifier?    string
+             |  |  |     +--ro equipment-type-name?          string
+             |  |  |     +--ro equipment-type-version?       string
+             |  |  |     +--ro manufacturer-identifier?      string
+             |  |  |     +--ro manufacturer-name?            string
+             |  |  +--ro actual-equipment
+             |  |  |  +--ro actual-non-field-replaceable-module* []
+             |  |  |  |  +--ro common-actual-properties
+             |  |  |  |  |  +--ro asset-instance-identifier?   string
+             |  |  |  |  |  +--ro is-powered?                  boolean
+             |  |  |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
+             |  |  |  |  |  +--ro serial-number?               string
+             |  |  |  |  |  +--ro temperature?                 decimal64
+             |  |  |  |  +--ro common-equipment-properties
+             |  |  |  |     +--ro asset-type-identifier?        string
+             |  |  |  |     +--ro equipment-type-description?   string
+             |  |  |  |     +--ro equipment-type-identifier?    string
+             |  |  |  |     +--ro equipment-type-name?          string
+             |  |  |  |     +--ro equipment-type-version?       string
+             |  |  |  |     +--ro manufacturer-identifier?      string
+             |  |  |  |     +--ro manufacturer-name?            string
+             |  |  |  +--ro common-actual-properties
+             |  |  |  |  +--ro asset-instance-identifier?   string
+             |  |  |  |  +--ro is-powered?                  boolean
+             |  |  |  |  +--ro manufacture-date?            tapi-common:date-and-time
+             |  |  |  |  +--ro serial-number?               string
+             |  |  |  |  +--ro temperature?                 decimal64
+             |  |  |  +--ro common-equipment-properties
+             |  |  |     +--ro asset-type-identifier?        string
+             |  |  |     +--ro equipment-type-description?   string
+             |  |  |     +--ro equipment-type-identifier?    string
+             |  |  |     +--ro equipment-type-name?          string
+             |  |  |     +--ro equipment-type-version?       string
+             |  |  |     +--ro manufacturer-identifier?      string
+             |  |  |     +--ro manufacturer-name?            string
+             |  |  +--ro uuid                           uuid
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro access-port* [uuid]
+             |  |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
+             |  |  |  +--ro connector-identification    string
+             |  |  |  +--ro pin-identification          string
+             |  |  |  +--ro equipment-uuid              tapi-common:uuid
+             |  |  |  +--ro pin-and-role* []
+             |  |  |     +--ro location-in-connector?   string
+             |  |  |     +--ro pin-role*                string
+             |  |  |     +--ro pin-name?                string
+             |  |  +--ro uuid             uuid
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro uuid?          uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro physical-span {tapi-streaming}?
+             |  +--ro access-port* [device-uuid access-port-uuid]
+             |  |  +--ro device-uuid         -> /tapi-common:context/tapi-equipment:physical-context/device/uuid
+             |  |  +--ro access-port-uuid    -> /tapi-common:context/tapi-equipment:physical-context/device/access-port/uuid
+             |  +--ro abstract-strand* [local-id]
+             |  |  +--ro adjacent-strand* [physical-span-uuid abstract-strand-local-id]
+             |  |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
+             |  |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
+             |  |  +--ro spliced-strand* [physical-span-uuid abstract-strand-local-id]
+             |  |  |  +--ro physical-span-uuid          -> /tapi-common:context/tapi-equipment:physical-context/physical-span/uuid
+             |  |  |  +--ro abstract-strand-local-id    -> /tapi-common:context/tapi-equipment:physical-context/physical-span/abstract-strand/local-id
+             |  |  +--ro connector-pin* [connector-identification pin-identification equipment-uuid]
+             |  |  |  +--ro connector-identification    string
+             |  |  |  +--ro pin-identification          string
+             |  |  |  +--ro equipment-uuid              tapi-common:uuid
+             |  |  |  +--ro pin-and-role* []
+             |  |  |     +--ro location-in-connector?   string
+             |  |  |     +--ro pin-role*                string
+             |  |  |     +--ro pin-name?                string
+             |  |  +--ro strand-media-characteristics* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro local-id                        string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro uuid?              uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro mep {tapi-streaming}?
+             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
+             |  +--ro direction?             tapi-common:termination-direction
+             |  +--ro mep-identifier?        string
+             |  +--ro peer-mep-identifier*   string
+             |  +--ro local-id?              string
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro operational-state?     operational-state
+             |  +--ro lifecycle-state?       lifecycle-state
+             +--ro oam-job {tapi-streaming}?
+             |  +--ro oam-service-end-point* [oam-service-uuid oam-service-end-point-local-id]
+             |  |  +--ro oam-service-uuid                  -> /tapi-common:context/tapi-oam:oam-context/oam-service/uuid
+             |  |  +--ro oam-service-end-point-local-id    -> /tapi-common:context/tapi-oam:oam-context/oam-service/end-point/local-id
+             |  +--ro oam-profile
+             |  |  +--ro oam-profile-uuid?   -> /tapi-common:context/tapi-oam:oam-context/oam-profile/uuid
+             |  +--ro pm-current-data* [local-id]
+             |  |  +--ro pm-history-data* [local-id]
+             |  |  |  +--ro granularity-period
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    time-unit
+             |  |  |  +--ro period-end-time?         tapi-common:date-and-time
+             |  |  |  +--ro suspect-interval-flag?   boolean
+             |  |  |  +--ro local-id                 string
+             |  |  |  +--ro name* [value-name]
+             |  |  |     +--ro value-name    string
+             |  |  |     +--ro value?        string
+             |  |  +--ro granularity-period
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    time-unit
+             |  |  +--ro timestamp?               tapi-common:date-and-time
+             |  |  +--ro elapsed-time
+             |  |  |  +--ro period* [unit]
+             |  |  |     +--ro value?   uint64
+             |  |  |     +--ro unit     time-unit
+             |  |  +--ro suspect-interval-flag?   boolean
+             |  |  +--ro local-id                 string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro oam-job-type?            oam-job-type
+             |  +--ro schedule
+             |  |  +--ro end-time?     date-and-time
+             |  |  +--ro start-time?   date-and-time
+             |  +--ro creation-time?           tapi-common:date-and-time
+             |  +--ro uuid?                    uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?    administrative-state
+             |  +--ro operational-state?       operational-state
+             |  +--ro lifecycle-state?         lifecycle-state
+             +--ro meg {tapi-streaming}?
+             |  +--ro mep* [local-id]
+             |  |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
+             |  |  +--ro direction?             tapi-common:termination-direction
+             |  |  +--ro mep-identifier?        string
+             |  |  +--ro peer-mep-identifier*   string
+             |  |  +--ro local-id               string
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro operational-state?     operational-state
+             |  |  +--ro lifecycle-state?       lifecycle-state
+             |  +--ro mip* [local-id]
+             |  |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
+             |  |  +--ro local-id               string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
+             |  +--ro direction?             tapi-common:forwarding-direction
+             |  +--ro meg-level?             uint64
+             |  +--ro meg-identifier?        string
+             |  +--ro uuid?                  uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro operational-state?     operational-state
+             |  +--ro lifecycle-state?       lifecycle-state
+             +--ro mip {tapi-streaming}?
+             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
+             |  +--ro local-id?              string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro oam-service {tapi-streaming}?
+             |  +--ro end-point* [local-id]
+             |  |  +--ro service-interface-point
+             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro connectivity-service-end-point
+             |  |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  |  +--ro mep
+             |  |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
+             |  |  |  +--ro mep-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id
+             |  |  +--ro mip
+             |  |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
+             |  |  |  +--ro mip-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id
+             |  |  +--ro layer-protocol-name?              tapi-common:layer-protocol-name
+             |  |  +--ro direction?                        tapi-common:port-direction
+             |  |  +--ro mep-identifier?                   string
+             |  |  +--ro peer-mep-identifier*              string
+             |  |  +--ro local-id                          string
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro administrative-state?             administrative-state
+             |  |  +--ro operational-state?                operational-state
+             |  |  +--ro lifecycle-state?                  lifecycle-state
+             |  +--ro meg
+             |  |  +--ro meg-uuid?   -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
+             |  +--ro oam-profile
+             |  |  +--ro oam-profile-uuid?   -> /tapi-common:context/tapi-oam:oam-context/oam-profile/uuid
+             |  +--ro uuid?                   uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?   administrative-state
+             |  +--ro operational-state?      operational-state
+             |  +--ro lifecycle-state?        lifecycle-state
+             |  +--ro layer-protocol-name?    tapi-common:layer-protocol-name
+             |  +--ro direction?              tapi-common:forwarding-direction
+             |  +--ro meg-level?              uint64
+             +--ro oam-service-end-point {tapi-streaming}?
+             |  +--ro service-interface-point
+             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  +--ro connectivity-service-end-point
+             |  |  +--ro connectivity-service-uuid?                 -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid
+             |  |  +--ro connectivity-service-end-point-local-id?   -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id
+             |  +--ro mep
+             |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
+             |  |  +--ro mep-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id
+             |  +--ro mip
+             |  |  +--ro meg-uuid?       -> /tapi-common:context/tapi-oam:oam-context/meg/uuid
+             |  |  +--ro mip-local-id?   -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id
+             |  +--ro layer-protocol-name?              tapi-common:layer-protocol-name
+             |  +--ro direction?                        tapi-common:port-direction
+             |  +--ro mep-identifier?                   string
+             |  +--ro peer-mep-identifier*              string
+             |  +--ro local-id?                         string
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?             administrative-state
+             |  +--ro operational-state?                operational-state
+             |  +--ro lifecycle-state?                  lifecycle-state
+             +--ro pm-current-data {tapi-streaming}?
+             |  +--ro pm-history-data* [local-id]
+             |  |  +--ro granularity-period
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    time-unit
+             |  |  +--ro period-end-time?         tapi-common:date-and-time
+             |  |  +--ro suspect-interval-flag?   boolean
+             |  |  +--ro local-id                 string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro granularity-period
+             |  |  +--ro value?   uint64
+             |  |  +--ro unit?    time-unit
+             |  +--ro timestamp?               tapi-common:date-and-time
+             |  +--ro elapsed-time
+             |  |  +--ro period* [unit]
+             |  |     +--ro value?   uint64
+             |  |     +--ro unit     time-unit
+             |  +--ro suspect-interval-flag?   boolean
+             |  +--ro local-id?                string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro pm-history-data {tapi-streaming}?
+             |  +--ro granularity-period
+             |  |  +--ro value?   uint64
+             |  |  +--ro unit?    time-unit
+             |  +--ro period-end-time?         tapi-common:date-and-time
+             |  +--ro suspect-interval-flag?   boolean
+             |  +--ro local-id?                string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro oam-profile {tapi-streaming}?
+             |  +--ro pm-threshold-data* [local-id]
+             |  |  +--ro granularity-period
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    time-unit
+             |  |  +--ro is-transient?         boolean
+             |  |  +--ro local-id              string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro pm-bin-data* [local-id]
+             |  |  +--ro granularity-period
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    time-unit
+             |  |  +--ro local-id              string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro uuid?                uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro pm-threshold-data {tapi-streaming}?
+             |  +--ro granularity-period
+             |  |  +--ro value?   uint64
+             |  |  +--ro unit?    time-unit
+             |  +--ro is-transient?         boolean
+             |  +--ro local-id?             string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro pm-bin-data {tapi-streaming}?
+             |  +--ro granularity-period
+             |  |  +--ro value?   uint64
+             |  |  +--ro unit?    time-unit
+             |  +--ro local-id?             string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro path {tapi-streaming}?
+             |  +--ro link* [topology-uuid link-uuid]
+             |  |  +--ro topology-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro link-uuid        -> /tapi-common:context/tapi-topology:topology-context/topology/link/uuid
+             |  +--ro routing-constraint
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  +--ro traffic-property-name            string
+             |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  +--ro wander-characteristic?           string
+             |  |  +--ro risk-diversity-characteristic* [risk-characteristic-name]
+             |  |  |  +--ro risk-characteristic-name    string
+             |  |  |  +--ro risk-identifier-list*       string
+             |  |  +--ro diversity-policy?                diversity-policy
+             |  |  +--ro route-objective-function?        route-objective-function
+             |  |  +--ro route-direction?                 tapi-common:forwarding-direction
+             |  |  +--ro is-exclusive?                    boolean
+             |  |  +--ro max-allowed-cost
+             |  |  |  +--ro value?      uint64
+             |  |  |  +--ro priority?   uint64
+             |  |  +--ro max-allowed-hops
+             |  |  |  +--ro value?      uint64
+             |  |  |  +--ro priority?   uint64
+             |  |  +--ro max-allowed-delay
+             |  |     +--ro value?      uint64
+             |  |     +--ro priority?   uint64
+             |  +--ro direction?             tapi-common:forwarding-direction
+             |  +--ro layer-protocol-name?   tapi-common:layer-protocol-name
+             |  +--ro uuid?                  uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro path-computation-service {tapi-streaming}?
+             |  +--ro path* [path-uuid]
+             |  |  +--ro path-uuid    -> /tapi-common:context/tapi-path-computation:path-computation-context/path/uuid
+             |  +--ro end-point* [local-id]
+             |  |  +--ro service-interface-point
+             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro layer-protocol-name?        tapi-common:layer-protocol-name
+             |  |  +--ro layer-protocol-qualifier?   tapi-common:layer-protocol-qualifier
+             |  |  +--ro capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro role?                       tapi-common:port-role
+             |  |  +--ro direction?                  tapi-common:port-direction
+             |  |  +--ro local-id                    string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro routing-constraint
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  +--ro traffic-property-name            string
+             |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  +--ro wander-characteristic?           string
+             |  |  +--ro risk-diversity-characteristic* [risk-characteristic-name]
+             |  |  |  +--ro risk-characteristic-name    string
+             |  |  |  +--ro risk-identifier-list*       string
+             |  |  +--ro diversity-policy?                diversity-policy
+             |  |  +--ro route-objective-function?        route-objective-function
+             |  |  +--ro route-direction?                 tapi-common:forwarding-direction
+             |  |  +--ro is-exclusive?                    boolean
+             |  |  +--ro max-allowed-cost
+             |  |  |  +--ro value?      uint64
+             |  |  |  +--ro priority?   uint64
+             |  |  +--ro max-allowed-hops
+             |  |  |  +--ro value?      uint64
+             |  |  |  +--ro priority?   uint64
+             |  |  +--ro max-allowed-delay
+             |  |     +--ro value?      uint64
+             |  |     +--ro priority?   uint64
+             |  +--ro topology-constraint
+             |  |  +--ro include-topology*            tapi-common:uuid
+             |  |  +--ro avoid-topology*              tapi-common:uuid
+             |  |  +--ro include-path*                tapi-common:uuid
+             |  |  +--ro exclude-path*                tapi-common:uuid
+             |  |  +--ro include-link*                tapi-common:uuid
+             |  |  +--ro exclude-link*                tapi-common:uuid
+             |  |  +--ro include-node*                tapi-common:uuid
+             |  |  +--ro exclude-node*                tapi-common:uuid
+             |  |  +--ro preferred-transport-layer*   tapi-common:layer-protocol-name
+             |  +--ro objective-function
+             |  |  +--ro bandwidth-optimization?   tapi-common:directive-value
+             |  |  +--ro concurrent-paths?         tapi-common:directive-value
+             |  |  +--ro cost-optimization?        tapi-common:directive-value
+             |  |  +--ro link-utilization?         tapi-common:directive-value
+             |  |  +--ro resource-sharing?         tapi-common:directive-value
+             |  |  +--ro local-id?                 string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro optimization-constraint
+             |  |  +--ro traffic-interruption?   tapi-common:directive-value
+             |  |  +--ro local-id?               string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro uuid?                      uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro path-service-end-point {tapi-streaming}?
+             |  +--ro service-interface-point
+             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  +--ro layer-protocol-name?        tapi-common:layer-protocol-name
+             |  +--ro layer-protocol-qualifier?   tapi-common:layer-protocol-qualifier
+             |  +--ro capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro role?                       tapi-common:port-role
+             |  +--ro direction?                  tapi-common:port-direction
+             |  +--ro local-id?                   string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro path-optimization-constraint {tapi-streaming}?
+             |  +--ro traffic-interruption?   tapi-common:directive-value
+             |  +--ro local-id?               string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro path-objective-function {tapi-streaming}?
+             |  +--ro bandwidth-optimization?   tapi-common:directive-value
+             |  +--ro concurrent-paths?         tapi-common:directive-value
+             |  +--ro cost-optimization?        tapi-common:directive-value
+             |  +--ro link-utilization?         tapi-common:directive-value
+             |  +--ro resource-sharing?         tapi-common:directive-value
+             |  +--ro local-id?                 string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro link {tapi-streaming}?
+             |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
+             |  +--ro direction?                                 tapi-common:forwarding-direction
+             |  +--ro resilience-type
+             |  |  +--ro restoration-policy?   restoration-policy
+             |  |  +--ro protection-type?      protection-type
+             |  +--ro uuid?                                      uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?                      administrative-state
+             |  +--ro operational-state?                         operational-state
+             |  +--ro lifecycle-state?                           lifecycle-state
+             |  +--ro total-potential-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro available-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro cost-characteristic* [cost-name]
+             |  |  +--ro cost-name         string
+             |  |  +--ro cost-value?       string
+             |  |  +--ro cost-algorithm?   string
+             |  +--ro error-characteristic?                      string
+             |  +--ro loss-characteristic?                       string
+             |  +--ro repeat-delivery-characteristic?            string
+             |  +--ro delivery-order-characteristic?             string
+             |  +--ro unavailable-time-characteristic?           string
+             |  +--ro server-integrity-process-characteristic?   string
+             |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  +--ro traffic-property-name            string
+             |  |  +--ro fixed-latency-characteristic?    string
+             |  |  +--ro queing-latency-characteristic?   string
+             |  |  +--ro jitter-characteristic?           string
+             |  |  +--ro wander-characteristic?           string
+             |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |  +--ro risk-characteristic-name    string
+             |  |  +--ro risk-identifier-list*       string
+             |  +--ro validation-mechanism* [validation-mechanism]
+             |  |  +--ro validation-mechanism                  string
+             |  |  +--ro layer-protocol-adjacency-validated?   string
+             |  |  +--ro validation-robustness?                string
+             |  +--ro transitioned-layer-protocol-name*          string
+             +--ro node {tapi-streaming}?
+             |  +--ro owned-node-edge-point* [uuid]
+             |  |  +--ro layer-protocol-name?                      tapi-common:layer-protocol-name
+             |  |  +--ro supported-cep-layer-protocol-qualifier*   tapi-common:layer-protocol-qualifier
+             |  |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro mapped-service-interface-point* [service-interface-point-uuid]
+             |  |  |  +--ro service-interface-point-uuid    -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro link-port-direction?                      tapi-common:port-direction
+             |  |  +--ro link-port-role?                           tapi-common:port-role
+             |  |  +--ro uuid                                      uuid
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro administrative-state?                     administrative-state
+             |  |  +--ro operational-state?                        operational-state
+             |  |  +--ro lifecycle-state?                          lifecycle-state
+             |  |  +--ro termination-direction?                    termination-direction
+             |  |  +--ro termination-state?                        termination-state
+             |  |  +--ro total-potential-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro available-capacity
+             |  |     +--ro total-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro bandwidth-profile
+             |  |        +--ro bw-profile-type?              bandwidth-profile-type
+             |  |        +--ro committed-information-rate
+             |  |        |  +--ro value?   uint64
+             |  |        |  +--ro unit?    capacity-unit
+             |  |        +--ro committed-burst-size
+             |  |        |  +--ro value?   uint64
+             |  |        |  +--ro unit?    capacity-unit
+             |  |        +--ro peak-information-rate
+             |  |        |  +--ro value?   uint64
+             |  |        |  +--ro unit?    capacity-unit
+             |  |        +--ro peak-burst-size
+             |  |        |  +--ro value?   uint64
+             |  |        |  +--ro unit?    capacity-unit
+             |  |        +--ro color-aware?                  boolean
+             |  |        +--ro coupling-flag?                boolean
+             |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  +--ro node-rule-group* [uuid]
+             |  |  +--ro rule* [local-id]
+             |  |  |  +--ro rule-type?                   rule-type
+             |  |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  |  +--ro override-priority?           uint64
+             |  |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  |  +--ro cep-port-role* []
+             |  |  |  |  +--ro port-role*        port-role
+             |  |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  |  +--ro connection-spec-reference* []
+             |  |  |  |  +--ro connection-spec-name?   string
+             |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  |  +--ro signal-property
+             |  |  |  |  +--ro signal-property-name?         string
+             |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  |  +--ro complex-rule*                string
+             |  |  |  +--ro local-id                     string
+             |  |  |  +--ro name* [value-name]
+             |  |  |     +--ro value-name    string
+             |  |  |     +--ro value?        string
+             |  |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  |  +--ro inter-rule-group* [uuid]
+             |  |  |  +--ro rule* [local-id]
+             |  |  |  |  +--ro rule-type?                   rule-type
+             |  |  |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  |  |  +--ro override-priority?           uint64
+             |  |  |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  |  |  +--ro cep-port-role* []
+             |  |  |  |  |  +--ro port-role*        port-role
+             |  |  |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  |  |  +--ro connection-spec-reference* []
+             |  |  |  |  |  +--ro connection-spec-name?   string
+             |  |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  |  |  +--ro signal-property
+             |  |  |  |  |  +--ro signal-property-name?         string
+             |  |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  |  |  +--ro complex-rule*                string
+             |  |  |  |  +--ro local-id                     string
+             |  |  |  |  +--ro name* [value-name]
+             |  |  |  |     +--ro value-name    string
+             |  |  |  |     +--ro value?        string
+             |  |  |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  |  |  +--ro uuid                          uuid
+             |  |  |  +--ro name* [value-name]
+             |  |  |  |  +--ro value-name    string
+             |  |  |  |  +--ro value?        string
+             |  |  |  +--ro total-potential-capacity
+             |  |  |  |  +--ro total-size
+             |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |     +--ro committed-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro committed-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  +--ro available-capacity
+             |  |  |  |  +--ro total-size
+             |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |     +--ro committed-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro committed-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  |  +--ro cost-name         string
+             |  |  |  |  +--ro cost-value?       string
+             |  |  |  |  +--ro cost-algorithm?   string
+             |  |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  |  +--ro traffic-property-name            string
+             |  |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  |  +--ro wander-characteristic?           string
+             |  |  |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |  |     +--ro risk-characteristic-name    string
+             |  |  |     +--ro risk-identifier-list*       string
+             |  |  +--ro uuid                        uuid
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro total-potential-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro available-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  +--ro traffic-property-name            string
+             |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  +--ro wander-characteristic?           string
+             |  |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |     +--ro risk-characteristic-name    string
+             |  |     +--ro risk-identifier-list*       string
+             |  +--ro encap-topology
+             |  |  +--ro topology-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
+             |  +--ro uuid?                                      uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?                      administrative-state
+             |  +--ro operational-state?                         operational-state
+             |  +--ro lifecycle-state?                           lifecycle-state
+             |  +--ro total-potential-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro available-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro cost-characteristic* [cost-name]
+             |  |  +--ro cost-name         string
+             |  |  +--ro cost-value?       string
+             |  |  +--ro cost-algorithm?   string
+             |  +--ro error-characteristic?                      string
+             |  +--ro loss-characteristic?                       string
+             |  +--ro repeat-delivery-characteristic?            string
+             |  +--ro delivery-order-characteristic?             string
+             |  +--ro unavailable-time-characteristic?           string
+             |  +--ro server-integrity-process-characteristic?   string
+             |  +--ro latency-characteristic* [traffic-property-name]
+             |     +--ro traffic-property-name            string
+             |     +--ro fixed-latency-characteristic?    string
+             |     +--ro queing-latency-characteristic?   string
+             |     +--ro jitter-characteristic?           string
+             |     +--ro wander-characteristic?           string
+             +--ro topology {tapi-streaming}?
+             |  +--ro node* [uuid]
+             |  |  +--ro owned-node-edge-point* [uuid]
+             |  |  |  +--ro layer-protocol-name?                      tapi-common:layer-protocol-name
+             |  |  |  +--ro supported-cep-layer-protocol-qualifier*   tapi-common:layer-protocol-qualifier
+             |  |  |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  |  +--ro mapped-service-interface-point* [service-interface-point-uuid]
+             |  |  |  |  +--ro service-interface-point-uuid    -> /tapi-common:context/service-interface-point/uuid
+             |  |  |  +--ro link-port-direction?                      tapi-common:port-direction
+             |  |  |  +--ro link-port-role?                           tapi-common:port-role
+             |  |  |  +--ro uuid                                      uuid
+             |  |  |  +--ro name* [value-name]
+             |  |  |  |  +--ro value-name    string
+             |  |  |  |  +--ro value?        string
+             |  |  |  +--ro administrative-state?                     administrative-state
+             |  |  |  +--ro operational-state?                        operational-state
+             |  |  |  +--ro lifecycle-state?                          lifecycle-state
+             |  |  |  +--ro termination-direction?                    termination-direction
+             |  |  |  +--ro termination-state?                        termination-state
+             |  |  |  +--ro total-potential-capacity
+             |  |  |  |  +--ro total-size
+             |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |     +--ro committed-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro committed-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  +--ro available-capacity
+             |  |  |     +--ro total-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro bandwidth-profile
+             |  |  |        +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |        +--ro committed-information-rate
+             |  |  |        |  +--ro value?   uint64
+             |  |  |        |  +--ro unit?    capacity-unit
+             |  |  |        +--ro committed-burst-size
+             |  |  |        |  +--ro value?   uint64
+             |  |  |        |  +--ro unit?    capacity-unit
+             |  |  |        +--ro peak-information-rate
+             |  |  |        |  +--ro value?   uint64
+             |  |  |        |  +--ro unit?    capacity-unit
+             |  |  |        +--ro peak-burst-size
+             |  |  |        |  +--ro value?   uint64
+             |  |  |        |  +--ro unit?    capacity-unit
+             |  |  |        +--ro color-aware?                  boolean
+             |  |  |        +--ro coupling-flag?                boolean
+             |  |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro node-rule-group* [uuid]
+             |  |  |  +--ro rule* [local-id]
+             |  |  |  |  +--ro rule-type?                   rule-type
+             |  |  |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  |  |  +--ro override-priority?           uint64
+             |  |  |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  |  |  +--ro cep-port-role* []
+             |  |  |  |  |  +--ro port-role*        port-role
+             |  |  |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  |  |  +--ro connection-spec-reference* []
+             |  |  |  |  |  +--ro connection-spec-name?   string
+             |  |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  |  |  +--ro signal-property
+             |  |  |  |  |  +--ro signal-property-name?         string
+             |  |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  |  |  +--ro complex-rule*                string
+             |  |  |  |  +--ro local-id                     string
+             |  |  |  |  +--ro name* [value-name]
+             |  |  |  |     +--ro value-name    string
+             |  |  |  |     +--ro value?        string
+             |  |  |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  |  +--ro node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  |  |  +--ro inter-rule-group* [uuid]
+             |  |  |  |  +--ro rule* [local-id]
+             |  |  |  |  |  +--ro rule-type?                   rule-type
+             |  |  |  |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  |  |  |  +--ro override-priority?           uint64
+             |  |  |  |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  |  |  |  +--ro cep-port-role* []
+             |  |  |  |  |  |  +--ro port-role*        port-role
+             |  |  |  |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  |  |  |  +--ro connection-spec-reference* []
+             |  |  |  |  |  |  +--ro connection-spec-name?   string
+             |  |  |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  |  |  |  +--ro signal-property
+             |  |  |  |  |  |  +--ro signal-property-name?         string
+             |  |  |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  |  |  |  +--ro complex-rule*                string
+             |  |  |  |  |  +--ro local-id                     string
+             |  |  |  |  |  +--ro name* [value-name]
+             |  |  |  |  |     +--ro value-name    string
+             |  |  |  |  |     +--ro value?        string
+             |  |  |  |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  |  |  |  +--ro uuid                          uuid
+             |  |  |  |  +--ro name* [value-name]
+             |  |  |  |  |  +--ro value-name    string
+             |  |  |  |  |  +--ro value?        string
+             |  |  |  |  +--ro total-potential-capacity
+             |  |  |  |  |  +--ro total-size
+             |  |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |  |     +--ro committed-information-rate
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro committed-burst-size
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro peak-information-rate
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro peak-burst-size
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  |  +--ro available-capacity
+             |  |  |  |  |  +--ro total-size
+             |  |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |  |     +--ro committed-information-rate
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro committed-burst-size
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro peak-information-rate
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro peak-burst-size
+             |  |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  |  |  +--ro cost-name         string
+             |  |  |  |  |  +--ro cost-value?       string
+             |  |  |  |  |  +--ro cost-algorithm?   string
+             |  |  |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  |  |  +--ro traffic-property-name            string
+             |  |  |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  |  |  +--ro wander-characteristic?           string
+             |  |  |  |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |  |  |     +--ro risk-characteristic-name    string
+             |  |  |  |     +--ro risk-identifier-list*       string
+             |  |  |  +--ro uuid                        uuid
+             |  |  |  +--ro name* [value-name]
+             |  |  |  |  +--ro value-name    string
+             |  |  |  |  +--ro value?        string
+             |  |  |  +--ro total-potential-capacity
+             |  |  |  |  +--ro total-size
+             |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |     +--ro committed-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro committed-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  +--ro available-capacity
+             |  |  |  |  +--ro total-size
+             |  |  |  |  |  +--ro value?   uint64
+             |  |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  |  +--ro bandwidth-profile
+             |  |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |  |     +--ro committed-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro committed-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-information-rate
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro peak-burst-size
+             |  |  |  |     |  +--ro value?   uint64
+             |  |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |  |     +--ro color-aware?                  boolean
+             |  |  |  |     +--ro coupling-flag?                boolean
+             |  |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  |  +--ro cost-name         string
+             |  |  |  |  +--ro cost-value?       string
+             |  |  |  |  +--ro cost-algorithm?   string
+             |  |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  |  +--ro traffic-property-name            string
+             |  |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  |  +--ro wander-characteristic?           string
+             |  |  |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |  |     +--ro risk-characteristic-name    string
+             |  |  |     +--ro risk-identifier-list*       string
+             |  |  +--ro encap-topology
+             |  |  |  +--ro topology-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
+             |  |  +--ro uuid                                       uuid
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro administrative-state?                      administrative-state
+             |  |  +--ro operational-state?                         operational-state
+             |  |  +--ro lifecycle-state?                           lifecycle-state
+             |  |  +--ro total-potential-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro available-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro error-characteristic?                      string
+             |  |  +--ro loss-characteristic?                       string
+             |  |  +--ro repeat-delivery-characteristic?            string
+             |  |  +--ro delivery-order-characteristic?             string
+             |  |  +--ro unavailable-time-characteristic?           string
+             |  |  +--ro server-integrity-process-characteristic?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |     +--ro traffic-property-name            string
+             |  |     +--ro fixed-latency-characteristic?    string
+             |  |     +--ro queing-latency-characteristic?   string
+             |  |     +--ro jitter-characteristic?           string
+             |  |     +--ro wander-characteristic?           string
+             |  +--ro link* [uuid]
+             |  |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  |  +--ro layer-protocol-name*                       tapi-common:layer-protocol-name
+             |  |  +--ro direction?                                 tapi-common:forwarding-direction
+             |  |  +--ro resilience-type
+             |  |  |  +--ro restoration-policy?   restoration-policy
+             |  |  |  +--ro protection-type?      protection-type
+             |  |  +--ro uuid                                       uuid
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro administrative-state?                      administrative-state
+             |  |  +--ro operational-state?                         operational-state
+             |  |  +--ro lifecycle-state?                           lifecycle-state
+             |  |  +--ro total-potential-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro available-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro error-characteristic?                      string
+             |  |  +--ro loss-characteristic?                       string
+             |  |  +--ro repeat-delivery-characteristic?            string
+             |  |  +--ro delivery-order-characteristic?             string
+             |  |  +--ro unavailable-time-characteristic?           string
+             |  |  +--ro server-integrity-process-characteristic?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  +--ro traffic-property-name            string
+             |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  +--ro wander-characteristic?           string
+             |  |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |  |  +--ro risk-characteristic-name    string
+             |  |  |  +--ro risk-identifier-list*       string
+             |  |  +--ro validation-mechanism* [validation-mechanism]
+             |  |  |  +--ro validation-mechanism                  string
+             |  |  |  +--ro layer-protocol-adjacency-validated?   string
+             |  |  |  +--ro validation-robustness?                string
+             |  |  +--ro transitioned-layer-protocol-name*          string
+             |  +--ro layer-protocol-name*   tapi-common:layer-protocol-name
+             |  +--ro uuid?                  uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro node-edge-point {tapi-streaming}?
+             |  +--ro layer-protocol-name?                      tapi-common:layer-protocol-name
+             |  +--ro supported-cep-layer-protocol-qualifier*   tapi-common:layer-protocol-qualifier
+             |  +--ro aggregated-node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  +--ro mapped-service-interface-point* [service-interface-point-uuid]
+             |  |  +--ro service-interface-point-uuid    -> /tapi-common:context/service-interface-point/uuid
+             |  +--ro link-port-direction?                      tapi-common:port-direction
+             |  +--ro link-port-role?                           tapi-common:port-role
+             |  +--ro uuid?                                     uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro administrative-state?                     administrative-state
+             |  +--ro operational-state?                        operational-state
+             |  +--ro lifecycle-state?                          lifecycle-state
+             |  +--ro termination-direction?                    termination-direction
+             |  +--ro termination-state?                        termination-state
+             |  +--ro total-potential-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro available-capacity
+             |     +--ro total-size
+             |     |  +--ro value?   uint64
+             |     |  +--ro unit?    capacity-unit
+             |     +--ro bandwidth-profile
+             |        +--ro bw-profile-type?              bandwidth-profile-type
+             |        +--ro committed-information-rate
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro committed-burst-size
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro peak-information-rate
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro peak-burst-size
+             |        |  +--ro value?   uint64
+             |        |  +--ro unit?    capacity-unit
+             |        +--ro color-aware?                  boolean
+             |        +--ro coupling-flag?                boolean
+             +--ro rule {tapi-streaming}?
+             |  +--ro rule-type?                   rule-type
+             |  +--ro forwarding-rule?             forwarding-rule
+             |  +--ro override-priority?           uint64
+             |  +--ro cep-direction*               tapi-common:port-direction
+             |  +--ro cep-port-role* []
+             |  |  +--ro port-role*        port-role
+             |  |  +--ro port-role-rule*   port-role-rule-option
+             |  +--ro connection-spec-reference* []
+             |  |  +--ro connection-spec-name?   string
+             |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  +--ro signal-property
+             |  |  +--ro signal-property-name?         string
+             |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  +--ro applicable-signal-value*      string
+             |  |  +--ro number-of-signal-values?      uint64
+             |  +--ro complex-rule*                string
+             |  +--ro local-id?                    string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro node-rule-group {tapi-streaming}?
+             |  +--ro rule* [local-id]
+             |  |  +--ro rule-type?                   rule-type
+             |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  +--ro override-priority?           uint64
+             |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  +--ro cep-port-role* []
+             |  |  |  +--ro port-role*        port-role
+             |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  +--ro connection-spec-reference* []
+             |  |  |  +--ro connection-spec-name?   string
+             |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  +--ro signal-property
+             |  |  |  +--ro signal-property-name?         string
+             |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  +--ro complex-rule*                string
+             |  |  +--ro local-id                     string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-edge-point-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/owned-node-edge-point/uuid
+             |  +--ro node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  +--ro inter-rule-group* [uuid]
+             |  |  +--ro rule* [local-id]
+             |  |  |  +--ro rule-type?                   rule-type
+             |  |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  |  +--ro override-priority?           uint64
+             |  |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  |  +--ro cep-port-role* []
+             |  |  |  |  +--ro port-role*        port-role
+             |  |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  |  +--ro connection-spec-reference* []
+             |  |  |  |  +--ro connection-spec-name?   string
+             |  |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  |  +--ro signal-property
+             |  |  |  |  +--ro signal-property-name?         string
+             |  |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  |  +--ro complex-rule*                string
+             |  |  |  +--ro local-id                     string
+             |  |  |  +--ro name* [value-name]
+             |  |  |     +--ro value-name    string
+             |  |  |     +--ro value?        string
+             |  |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  |  +--ro uuid                          uuid
+             |  |  +--ro name* [value-name]
+             |  |  |  +--ro value-name    string
+             |  |  |  +--ro value?        string
+             |  |  +--ro total-potential-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro available-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  +--ro traffic-property-name            string
+             |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  +--ro wander-characteristic?           string
+             |  |  +--ro risk-characteristic* [risk-characteristic-name]
+             |  |     +--ro risk-characteristic-name    string
+             |  |     +--ro risk-identifier-list*       string
+             |  +--ro uuid?                       uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro total-potential-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro available-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro cost-characteristic* [cost-name]
+             |  |  +--ro cost-name         string
+             |  |  +--ro cost-value?       string
+             |  |  +--ro cost-algorithm?   string
+             |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  +--ro traffic-property-name            string
+             |  |  +--ro fixed-latency-characteristic?    string
+             |  |  +--ro queing-latency-characteristic?   string
+             |  |  +--ro jitter-characteristic?           string
+             |  |  +--ro wander-characteristic?           string
+             |  +--ro risk-characteristic* [risk-characteristic-name]
+             |     +--ro risk-characteristic-name    string
+             |     +--ro risk-identifier-list*       string
+             +--ro inter-rule-group {tapi-streaming}?
+             |  +--ro rule* [local-id]
+             |  |  +--ro rule-type?                   rule-type
+             |  |  +--ro forwarding-rule?             forwarding-rule
+             |  |  +--ro override-priority?           uint64
+             |  |  +--ro cep-direction*               tapi-common:port-direction
+             |  |  +--ro cep-port-role* []
+             |  |  |  +--ro port-role*        port-role
+             |  |  |  +--ro port-role-rule*   port-role-rule-option
+             |  |  +--ro connection-spec-reference* []
+             |  |  |  +--ro connection-spec-name?   string
+             |  |  |  +--ro connection-spec-id?     tapi-common:uuid
+             |  |  +--ro layer-protocol-qualifier*    tapi-common:layer-protocol-qualifier
+             |  |  +--ro signal-property
+             |  |  |  +--ro signal-property-name?         string
+             |  |  |  +--ro signal-property-value-rule?   signal-property-value-rule
+             |  |  |  +--ro applicable-signal-value*      string
+             |  |  |  +--ro number-of-signal-values?      uint64
+             |  |  +--ro complex-rule*                string
+             |  |  +--ro local-id                     string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro associated-node-rule-group* [topology-uuid node-uuid node-rule-group-uuid]
+             |  |  +--ro topology-uuid           -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  |  +--ro node-uuid               -> /tapi-common:context/tapi-topology:topology-context/topology/node/uuid
+             |  |  +--ro node-rule-group-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/node/node-rule-group/uuid
+             |  +--ro uuid?                         uuid
+             |  +--ro name* [value-name]
+             |  |  +--ro value-name    string
+             |  |  +--ro value?        string
+             |  +--ro total-potential-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro available-capacity
+             |  |  +--ro total-size
+             |  |  |  +--ro value?   uint64
+             |  |  |  +--ro unit?    capacity-unit
+             |  |  +--ro bandwidth-profile
+             |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |     +--ro committed-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro committed-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-information-rate
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro peak-burst-size
+             |  |     |  +--ro value?   uint64
+             |  |     |  +--ro unit?    capacity-unit
+             |  |     +--ro color-aware?                  boolean
+             |  |     +--ro coupling-flag?                boolean
+             |  +--ro cost-characteristic* [cost-name]
+             |  |  +--ro cost-name         string
+             |  |  +--ro cost-value?       string
+             |  |  +--ro cost-algorithm?   string
+             |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  +--ro traffic-property-name            string
+             |  |  +--ro fixed-latency-characteristic?    string
+             |  |  +--ro queing-latency-characteristic?   string
+             |  |  +--ro jitter-characteristic?           string
+             |  |  +--ro wander-characteristic?           string
+             |  +--ro risk-characteristic* [risk-characteristic-name]
+             |     +--ro risk-characteristic-name    string
+             |     +--ro risk-identifier-list*       string
+             +--ro network-topology-service {tapi-streaming}?
+             |  +--ro topology* [topology-uuid]
+             |  |  +--ro topology-uuid    -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  +--ro uuid?       uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro virtual-network-service {tapi-streaming}?
+             |  +--ro topology
+             |  |  +--ro topology-uuid?   -> /tapi-common:context/tapi-topology:topology-context/topology/uuid
+             |  +--ro end-point* [local-id]
+             |  |  +--ro service-interface-point
+             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro role?                      tapi-common:port-role
+             |  |  +--ro direction?                 tapi-common:port-direction
+             |  |  +--ro service-layer?             tapi-common:layer-protocol-name
+             |  |  +--ro local-id                   string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro vnw-constraint* [local-id]
+             |  |  +--ro src-service-end-point
+             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro sink-service-end-point
+             |  |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  |  +--ro diversity-exclusion* [virtual-nw-service-uuid]
+             |  |  |  +--ro virtual-nw-service-uuid    -> /tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service/uuid
+             |  |  +--ro requested-capacity
+             |  |  |  +--ro total-size
+             |  |  |  |  +--ro value?   uint64
+             |  |  |  |  +--ro unit?    capacity-unit
+             |  |  |  +--ro bandwidth-profile
+             |  |  |     +--ro bw-profile-type?              bandwidth-profile-type
+             |  |  |     +--ro committed-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro committed-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-information-rate
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro peak-burst-size
+             |  |  |     |  +--ro value?   uint64
+             |  |  |     |  +--ro unit?    capacity-unit
+             |  |  |     +--ro color-aware?                  boolean
+             |  |  |     +--ro coupling-flag?                boolean
+             |  |  +--ro service-level?            string
+             |  |  +--ro service-layer*            tapi-common:layer-protocol-name
+             |  |  +--ro cost-characteristic* [cost-name]
+             |  |  |  +--ro cost-name         string
+             |  |  |  +--ro cost-value?       string
+             |  |  |  +--ro cost-algorithm?   string
+             |  |  +--ro latency-characteristic* [traffic-property-name]
+             |  |  |  +--ro traffic-property-name            string
+             |  |  |  +--ro fixed-latency-characteristic?    string
+             |  |  |  +--ro queing-latency-characteristic?   string
+             |  |  |  +--ro jitter-characteristic?           string
+             |  |  |  +--ro wander-characteristic?           string
+             |  |  +--ro local-id                  string
+             |  |  +--ro name* [value-name]
+             |  |     +--ro value-name    string
+             |  |     +--ro value?        string
+             |  +--ro schedule
+             |  |  +--ro end-time?     date-and-time
+             |  |  +--ro start-time?   date-and-time
+             |  +--ro state
+             |  |  +--ro administrative-state?   administrative-state
+             |  |  +--ro operational-state?      operational-state
+             |  |  +--ro lifecycle-state?        lifecycle-state
+             |  +--ro layer-protocol-name*   tapi-common:layer-protocol-name
+             |  +--ro uuid?                  uuid
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro virtual-network-service-end-point {tapi-streaming}?
+             |  +--ro service-interface-point
+             |  |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+             |  +--ro role?                      tapi-common:port-role
+             |  +--ro direction?                 tapi-common:port-direction
+             |  +--ro service-layer?             tapi-common:layer-protocol-name
+             |  +--ro local-id?                  string
+             |  +--ro name* [value-name]
+             |     +--ro value-name    string
+             |     +--ro value?        string
+             +--ro virtual-network-constraint {tapi-streaming}?
+                +--ro src-service-end-point
+                |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+                +--ro sink-service-end-point
+                |  +--ro service-interface-point-uuid?   -> /tapi-common:context/service-interface-point/uuid
+                +--ro diversity-exclusion* [virtual-nw-service-uuid]
+                |  +--ro virtual-nw-service-uuid    -> /tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service/uuid
+                +--ro requested-capacity
+                |  +--ro total-size
+                |  |  +--ro value?   uint64
+                |  |  +--ro unit?    capacity-unit
+                |  +--ro bandwidth-profile
+                |     +--ro bw-profile-type?              bandwidth-profile-type
+                |     +--ro committed-information-rate
+                |     |  +--ro value?   uint64
+                |     |  +--ro unit?    capacity-unit
+                |     +--ro committed-burst-size
+                |     |  +--ro value?   uint64
+                |     |  +--ro unit?    capacity-unit
+                |     +--ro peak-information-rate
+                |     |  +--ro value?   uint64
+                |     |  +--ro unit?    capacity-unit
+                |     +--ro peak-burst-size
+                |     |  +--ro value?   uint64
+                |     |  +--ro unit?    capacity-unit
+                |     +--ro color-aware?                  boolean
+                |     +--ro coupling-flag?                boolean
+                +--ro service-level?            string
+                +--ro service-layer*            tapi-common:layer-protocol-name
+                +--ro cost-characteristic* [cost-name]
+                |  +--ro cost-name         string
+                |  +--ro cost-value?       string
+                |  +--ro cost-algorithm?   string
+                +--ro latency-characteristic* [traffic-property-name]
+                |  +--ro traffic-property-name            string
+                |  +--ro fixed-latency-characteristic?    string
+                |  +--ro queing-latency-characteristic?   string
+                |  +--ro jitter-characteristic?           string
+                |  +--ro wander-characteristic?           string
+                +--ro local-id?                 string
+                +--ro name* [value-name]
+                   +--ro value-name    string
+                   +--ro value?        string
diff --git a/YANG/tapi-streaming@2020-04-23.yang b/YANG/tapi-streaming@2020-04-23.yang
index 1fef5b5d..5015f225 100644
--- a/YANG/tapi-streaming@2020-04-23.yang
+++ b/YANG/tapi-streaming@2020-04-23.yang
@@ -47,6 +47,8 @@ module tapi-streaming {
         License: This module is distributed under the Apache License 2.0.";
     revision 2020-04-23 {
         description "ONF Transport API version 2.1.3.
+                   - Comment typos corrected.
+                   - One attribute changed (sourcePrecesion/source-precesion --> sourcePrecision/source-precision).
                    Changes included in this TAPI release (v2.1.3) are listed in
                    <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xm1nx_D$ >";
         reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model
diff --git a/YANG/tapi-virtual-network@2020-04-23.tree b/YANG/tapi-virtual-network@2020-04-23.tree
index d3aad4d9..a495d991 100644
--- a/YANG/tapi-virtual-network@2020-04-23.tree
+++ b/YANG/tapi-virtual-network@2020-04-23.tree
@@ -58,7 +58,9 @@ module: tapi-virtual-network
           |  +--rw name* [value-name]
           |     +--rw value-name    string
           |     +--rw value?        string
-          +--rw schedule?              string
+          +--rw schedule
+          |  +--rw end-time?     date-and-time
+          |  +--rw start-time?   date-and-time
           +--rw state
           |  +--rw administrative-state?   administrative-state
           |  +--ro operational-state?      operational-state
@@ -125,7 +127,9 @@ module: tapi-virtual-network
     |  |  |  +---w name* [value-name]
     |  |  |     +---w value-name    string
     |  |  |     +---w value?        string
-    |  |  +---w conn-schedule?    string
+    |  |  +---w conn-schedule
+    |  |     +---w end-time?     date-and-time
+    |  |     +---w start-time?   date-and-time
     |  +--ro output
     |     +--ro service
     |        +--ro topology
@@ -183,7 +187,9 @@ module: tapi-virtual-network
     |        |  +--ro name* [value-name]
     |        |     +--ro value-name    string
     |        |     +--ro value?        string
-    |        +--ro schedule?              string
+    |        +--ro schedule
+    |        |  +--ro end-time?     date-and-time
+    |        |  +--ro start-time?   date-and-time
     |        +--ro state
     |        |  +--ro administrative-state?   administrative-state
     |        |  +--ro operational-state?      operational-state
@@ -253,7 +259,9 @@ module: tapi-virtual-network
     |        |  +--ro name* [value-name]
     |        |     +--ro value-name    string
     |        |     +--ro value?        string
-    |        +--ro schedule?              string
+    |        +--ro schedule
+    |        |  +--ro end-time?     date-and-time
+    |        |  +--ro start-time?   date-and-time
     |        +--ro state
     |        |  +--ro administrative-state?   administrative-state
     |        |  +--ro operational-state?      operational-state
@@ -323,7 +331,9 @@ module: tapi-virtual-network
     |        |  +--ro name* [value-name]
     |        |     +--ro value-name    string
     |        |     +--ro value?        string
-    |        +--ro schedule?              string
+    |        +--ro schedule
+    |        |  +--ro end-time?     date-and-time
+    |        |  +--ro start-time?   date-and-time
     |        +--ro state
     |        |  +--ro administrative-state?   administrative-state
     |        |  +--ro operational-state?      operational-state
@@ -391,7 +401,9 @@ module: tapi-virtual-network
              |  +--ro name* [value-name]
              |     +--ro value-name    string
              |     +--ro value?        string
-             +--ro schedule?              string
+             +--ro schedule
+             |  +--ro end-time?     date-and-time
+             |  +--ro start-time?   date-and-time
              +--ro state
              |  +--ro administrative-state?   administrative-state
              |  +--ro operational-state?      operational-state
diff --git a/YANG/tapi-virtual-network@2020-04-23.yang b/YANG/tapi-virtual-network@2020-04-23.yang
index 69bb1540..98065a05 100644
--- a/YANG/tapi-virtual-network@2020-04-23.yang
+++ b/YANG/tapi-virtual-network@2020-04-23.yang
@@ -12,7 +12,7 @@ module tapi-virtual-network {
          Project Web: <https://wiki.opennetworking.org/display/OTCC/TAPI>
          Project List: <mailto:transport-api@opennetworking.org>
          Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>
-         Andrea Mazzin <mailto:andrea.mazzini@nokia.com>
+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>
          Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>
          Nigel Davis <mailto:ndavis@ciena.com>";
     description "
@@ -32,6 +32,7 @@ module tapi-virtual-network {
         License: This module is distributed under the Apache License 2.0.";
     revision 2020-04-23 {
         description "ONF Transport API version 2.1.3.
+                   - schedule type changed to tapi-common:time-range.
                    Changes included in this TAPI release (v2.1.3) are listed in
                    <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md>";
         reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model
@@ -87,7 +88,7 @@ module tapi-virtual-network {
         description "Augments the base TAPI Context with VirtualNetworkService information";
     }
    /**************************
-    * definitions of refrences
+    * definitions of references
     **************************/
     grouping virtual-nw-service-ref {
         leaf virtual-nw-service-uuid {
@@ -162,8 +163,8 @@ module tapi-virtual-network {
             uses virtual-network-constraint;
             description "none";
         }
-        leaf schedule {
-            type string;
+        container schedule {
+            uses tapi-common:time-range;
             description "none";
         }
         container state {
@@ -233,8 +234,8 @@ module tapi-virtual-network {
                 uses virtual-network-constraint;
                 description "none";
             }
-            leaf conn-schedule {
-                type string;
+            container conn-schedule {
+                uses tapi-common:time-range;
                 description "none";
             }
         }

From 9a4b0f06f7dfdb2ecabfdab6a7474424c6dd190c Mon Sep 17 00:00:00 2001
From: amazzini <andrea.mazzini@nokia.com>
Date: Thu, 11 Jun 2020 16:05:23 +0200
Subject: [PATCH 5/6] OAS modules (experimental)

---
 OAS/tapi-connectivity@2020-04-23.yaml     |   55 +-
 OAS/tapi-dsr@2020-04-23.yaml              |   55 +-
 OAS/tapi-equipment@2020-04-23.yaml        |   22 +-
 OAS/tapi-eth@2020-04-23.yaml              |   55 +-
 OAS/tapi-notification@2020-04-23.yaml     |    1 +
 OAS/tapi-oam@2020-04-23.yaml              |   55 +-
 OAS/tapi-odu@2020-04-23.yaml              |   55 +-
 OAS/tapi-path-computation@2020-04-23.yaml |   22 +-
 OAS/tapi-photonic-media@2020-04-23.yaml   | 3908 +++++++++++++++++--
 OAS/tapi-streaming@2020-04-23.yaml        | 4224 +++++++++++++++++++--
 OAS/tapi-topology@2020-04-23.yaml         |   22 +-
 OAS/tapi-virtual-network@2020-04-23.yaml  |  118 +-
 12 files changed, 7760 insertions(+), 832 deletions(-)

diff --git a/OAS/tapi-connectivity@2020-04-23.yaml b/OAS/tapi-connectivity@2020-04-23.yaml
index 14deacfe..89769f8d 100644
--- a/OAS/tapi-connectivity@2020-04-23.yaml
+++ b/OAS/tapi-connectivity@2020-04-23.yaml
@@ -5,32 +5,34 @@ info:
     \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -13155,8 +13157,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -13181,10 +13183,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -13645,6 +13647,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-dsr@2020-04-23.yaml b/OAS/tapi-dsr@2020-04-23.yaml
index b752e84c..c2062fff 100644
--- a/OAS/tapi-dsr@2020-04-23.yaml
+++ b/OAS/tapi-dsr@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI OAM Model definitions.\r\
@@ -38,16 +39,17 @@ info:
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -16170,8 +16172,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -16196,10 +16198,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -16674,6 +16676,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-equipment@2020-04-23.yaml b/OAS/tapi-equipment@2020-04-23.yaml
index 1018268f..b2518a10 100644
--- a/OAS/tapi-equipment@2020-04-23.yaml
+++ b/OAS/tapi-equipment@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -7836,6 +7837,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-eth@2020-04-23.yaml b/OAS/tapi-eth@2020-04-23.yaml
index 255cc0ba..3c783a89 100644
--- a/OAS/tapi-eth@2020-04-23.yaml
+++ b/OAS/tapi-eth@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI OAM Model definitions.\r\
@@ -38,16 +39,17 @@ info:
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -21314,8 +21316,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -21340,10 +21342,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -23527,6 +23529,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-notification@2020-04-23.yaml b/OAS/tapi-notification@2020-04-23.yaml
index 553b8f05..e715a5eb 100644
--- a/OAS/tapi-notification@2020-04-23.yaml
+++ b/OAS/tapi-notification@2020-04-23.yaml
@@ -2142,6 +2142,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-oam@2020-04-23.yaml b/OAS/tapi-oam@2020-04-23.yaml
index 5a1a14c4..000bea82 100644
--- a/OAS/tapi-oam@2020-04-23.yaml
+++ b/OAS/tapi-oam@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI OAM Model definitions.\r\
@@ -38,16 +39,17 @@ info:
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -16153,8 +16155,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -16179,10 +16181,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -16657,6 +16659,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-odu@2020-04-23.yaml b/OAS/tapi-odu@2020-04-23.yaml
index eaad7af5..5a0076ad 100644
--- a/OAS/tapi-odu@2020-04-23.yaml
+++ b/OAS/tapi-odu@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI ODU Model definitions.\r\
@@ -55,16 +56,17 @@ info:
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -17275,8 +17277,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -17301,10 +17303,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -17805,6 +17807,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-path-computation@2020-04-23.yaml b/OAS/tapi-path-computation@2020-04-23.yaml
index 6299ed11..9073664d 100644
--- a/OAS/tapi-path-computation@2020-04-23.yaml
+++ b/OAS/tapi-path-computation@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -8686,6 +8687,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-photonic-media@2020-04-23.yaml b/OAS/tapi-photonic-media@2020-04-23.yaml
index 0d7ddef2..a117e14b 100644
--- a/OAS/tapi-photonic-media@2020-04-23.yaml
+++ b/OAS/tapi-photonic-media@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Photonic Media\
@@ -73,16 +74,17 @@ info:
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -2131,11 +2133,11 @@ paths:
             $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "returns tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2150,15 +2152,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "creates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2172,12 +2174,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
           \ to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
         201:
           description: "Object created"
@@ -2188,7 +2190,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "creates or updates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2202,12 +2204,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
           \ to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
         201:
           description: "Object created"
@@ -2218,7 +2220,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "removes tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2236,12 +2238,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/capacity/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2255,16 +2259,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConfigPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2277,11 +2283,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
         201:
           description: "Object created"
@@ -2292,8 +2298,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2306,11 +2314,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
         201:
           description: "Object created"
@@ -2321,8 +2329,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2339,11 +2349,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
-  : get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config/
+  : post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2356,17 +2366,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2379,23 +2396,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.MediaChannelConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2408,12 +2424,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
         201:
           description: "Object created"
@@ -2424,7 +2445,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2437,17 +2458,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
-  : get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name/
+  : post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2459,18 +2487,32 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2482,24 +2524,30 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2511,12 +2559,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
         201:
           description: "Object created"
@@ -2527,8 +2585,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2540,12 +2600,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2562,6 +2632,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerManagementConfigPac"
@@ -2585,6 +2660,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
         description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
@@ -2615,6 +2695,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
         description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
@@ -2645,12 +2730,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-maximum-input-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-maximum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2669,6 +2759,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -2694,6 +2789,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -2725,6 +2825,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -2756,12 +2861,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-minimum-input-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-minimum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2780,6 +2890,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -2805,6 +2920,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -2836,6 +2956,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -2867,12 +2992,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-maximum-output-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-maximum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2891,6 +3021,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -2916,6 +3051,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -2947,6 +3087,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -2978,12 +3123,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-minimum-output-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-minimum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -3002,6 +3152,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -3027,6 +3182,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -3058,6 +3218,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -3089,19 +3254,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
-    post:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3113,27 +3281,23 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3145,25 +3309,29 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3175,17 +3343,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
       responses:
         201:
           description: "Object created"
@@ -3195,11 +3363,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3211,9 +3377,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -3221,11 +3387,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
-    get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/frequency-constraint/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3238,17 +3404,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3261,12 +3432,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
       responses:
         201:
           description: "Object created"
@@ -3276,8 +3452,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3290,12 +3466,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
       responses:
         201:
           description: "Object created"
@@ -3305,8 +3486,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3319,16 +3500,21 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3343,15 +3529,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepCommonPac"
+          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3365,11 +3551,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added to list"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       responses:
         201:
           description: "Object created"
@@ -3379,8 +3566,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3394,11 +3581,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       responses:
         201:
           description: "Object created"
@@ -3408,8 +3596,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3427,11 +3615,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3446,15 +3634,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepCtpPac"
+          description: "tapi.photonic.media.MediaChannelConfigPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3468,11 +3656,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added to list"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
         201:
           description: "Object created"
@@ -3482,8 +3670,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3497,11 +3685,2968 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerManagementConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-maximum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-minimum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-maximum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-minimum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerManagementConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-maximum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-minimum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-maximum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-minimum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCsepCommonPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCsepCtpPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCsepTtpPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/:
+    get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
+          \ be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
+          \ be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.OtsiTerminationConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/application-identifier/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.ApplicationIdentifier"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.CentralFrequency"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
       responses:
         201:
           description: "Object created"
@@ -3511,8 +6656,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3525,17 +6670,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/transmit-power/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3547,18 +6697,23 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepTtpPac"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3570,12 +6725,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
       responses:
         201:
           description: "Object created"
@@ -3585,9 +6745,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3599,12 +6759,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
       responses:
         201:
           description: "Object created"
@@ -3614,9 +6779,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3628,6 +6793,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
@@ -4156,6 +7326,133 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
   ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/spectrum/
   : get:
       tags:
@@ -21693,8 +24990,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -21719,10 +25016,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -21877,9 +25174,11 @@ definitions:
   tapi.connectivity.connectivityservice.EndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
-    - $ref: "#/definitions/tapi.odu.EndPointAugmentation3"
+    - $ref: "#/definitions/tapi.odu.EndPointAugmentation5"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation1"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation2"
+    - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation3"
+    - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation4"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -22325,6 +25624,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
@@ -23232,7 +26532,7 @@ definitions:
     enum:
     - "PERCENTAGE"
     - "NUMBER_ERRORED_BLOCKS"
-  tapi.odu.EndPointAugmentation3:
+  tapi.odu.EndPointAugmentation5:
     type: "object"
     properties:
       odu-connectivity-service-end-point-spec:
@@ -24232,6 +27532,24 @@ definitions:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation1:
+    type: "object"
+    properties:
+      media-channel-aconnectivity-service-end-point-spec:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+    x-augmentation:
+      prefix: "tapi-photonic-media"
+      namespace: "urn:onf:otcc:yang:tapi-photonic-media"
+  tapi.photonic.media.EndPointAugmentation2:
+    type: "object"
+    properties:
+      otsi-aconnectivity-service-end-point-spec:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+    x-augmentation:
+      prefix: "tapi-photonic-media"
+      namespace: "urn:onf:otcc:yang:tapi-photonic-media"
+  tapi.photonic.media.EndPointAugmentation3:
     type: "object"
     properties:
       media-channel-connectivity-service-end-point-spec:
@@ -24240,7 +27558,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
-  tapi.photonic.media.EndPointAugmentation2:
+  tapi.photonic.media.EndPointAugmentation4:
     type: "object"
     properties:
       otsi-connectivity-service-end-point-spec:
@@ -24332,14 +27650,41 @@ definitions:
     - "PUMP"
     - "MODULATED"
     - "PULSE"
-  tapi.photonic.media.MediaChannelAssemblySpec:
-    type: "object"
-  tapi.photonic.media.MediaChannelConfigPac:
+  tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec:
     type: "object"
     properties:
-      spectrum:
+      number-of-mc:
+        type: "integer"
+        format: "int32"
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        default: 1
+      mc-config:
+        type: "array"
+        description: "none"
+        items:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+      capacity:
+        description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+          \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+          \ be omitted if spectrum is not specified."
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.photonic.media.MediaChannelAssemblySpec:
+    type: "object"
+  tapi.photonic.media.MediaChannelConfigPac:
+    allOf:
+    - $ref: "#/definitions/tapi.common.LocalClass"
+    - type: "object"
+      properties:
+        spectrum:
+          description: "none"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        power-management-config-pac:
+          description: "none"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      description: "This class allows the provisioning of the parameters of a single\
+        \ MC / OTSiMC.\r\n            The [1..*] with MediaChannelAConnectivityServiceEndPointSpec\
+        \ allows the configuration of power properties (PowerManagementConfigPac)\
+        \ even in case of no spectrum specified, i.e. 'empty' MediaChannelConfigPac."
   tapi.photonic.media.MediaChannelConnectionEndPointSpec:
     type: "object"
     properties:
@@ -24428,6 +27773,19 @@ definitions:
       ots-media-channel:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+  tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec:
+    type: "object"
+    properties:
+      otsi-config:
+        type: "array"
+        description: "none"
+        items:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      number-of-otsi:
+        type: "integer"
+        format: "int32"
+        description: "none"
+        default: 1
   tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec:
     type: "object"
     properties:
@@ -24492,37 +27850,43 @@ definitions:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
   tapi.photonic.media.OtsiTerminationConfigPac:
-    type: "object"
-    properties:
-      application-identifier:
-        description: "This attribute indicates the selected Application Identifier."
-        $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
-      central-frequency:
-        description: "The central frequency of the laser. It is the oscillation frequency\
-          \ of the corresponding electromagnetic wave"
-        $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
-      modulation:
-        description: "The modulation techniqu selected at the source."
-        $ref: "#/definitions/tapi.photonic.media.ModulationTechnique"
-      spectrum:
-        description: "none"
-        $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
-      laser-control:
-        description: "Laser control can be FORCED-ON, FORCED-OFF or LASER-SHUTDOWN"
-        $ref: "#/definitions/tapi.photonic.media.LaserControlType"
-      total-power-warn-threshold-lower:
-        type: "string"
-        description: "Allows to configure the Lowerpower threshold which is expected\
-          \ to be different from Default, but within the Min and Max values specified\
-          \ as OTSi SIP capability."
-      total-power-warn-threshold-upper:
-        type: "string"
-        description: "Allows to configure the Upper power threshold which is expected\
-          \ to be different from Default, but within the Min and Max values specified\
-          \ as OTSi SIP capability."
-      transmit-power:
-        description: "Transmit power as requested."
-        $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+    allOf:
+    - $ref: "#/definitions/tapi.common.LocalClass"
+    - type: "object"
+      properties:
+        application-identifier:
+          description: "This attribute indicates the selected Application Identifier."
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+        central-frequency:
+          description: "The central frequency of the laser. It is the oscillation\
+            \ frequency of the corresponding electromagnetic wave"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+        modulation:
+          description: "The modulation techniqu selected at the source."
+          $ref: "#/definitions/tapi.photonic.media.ModulationTechnique"
+        spectrum:
+          description: "none"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        laser-control:
+          description: "Laser control can be FORCED-ON, FORCED-OFF or LASER-SHUTDOWN"
+          $ref: "#/definitions/tapi.photonic.media.LaserControlType"
+        total-power-warn-threshold-lower:
+          type: "string"
+          description: "Allows to configure the Lowerpower threshold which is expected\
+            \ to be different from Default, but within the Min and Max values specified\
+            \ as OTSi SIP capability."
+        total-power-warn-threshold-upper:
+          type: "string"
+          description: "Allows to configure the Upper power threshold which is expected\
+            \ to be different from Default, but within the Min and Max values specified\
+            \ as OTSi SIP capability."
+        transmit-power:
+          description: "Transmit power as requested."
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+      description: "This class allows the provisioning of the parameters of a single\
+        \ OTSi.\r\n            In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec),\
+        \ it is intended that the choice of the parameter values is fully delegated\
+        \ to the server controller."
   tapi.photonic.media.OtsiTerminationPac:
     type: "object"
     properties:
diff --git a/OAS/tapi-streaming@2020-04-23.yaml b/OAS/tapi-streaming@2020-04-23.yaml
index fa5dddaa..01fd5410 100644
--- a/OAS/tapi-streaming@2020-04-23.yaml
+++ b/OAS/tapi-streaming@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \ Source: TapiStreaming.uml\r\n        - The TAPI YANG models included in this\
     \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
     \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
-    \ mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Virtual Network\
@@ -88,16 +89,17 @@ info:
     \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Photonic Media\
@@ -156,16 +158,17 @@ info:
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -2197,11 +2200,11 @@ paths:
             $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "returns tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2216,15 +2219,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "creates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2238,12 +2241,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
           \ to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
         201:
           description: "Object created"
@@ -2254,7 +2257,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "creates or updates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2268,12 +2271,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
           \ to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
         201:
           description: "Object created"
@@ -2284,7 +2287,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      summary: "removes tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2302,12 +2305,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/capacity/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2321,16 +2326,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConfigPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2343,11 +2350,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
         201:
           description: "Object created"
@@ -2358,8 +2365,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2372,11 +2381,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
         201:
           description: "Object created"
@@ -2387,8 +2396,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2405,11 +2416,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
-  : get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config/
+  : post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2422,17 +2433,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2445,23 +2463,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.MediaChannelConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2474,12 +2491,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
         201:
           description: "Object created"
@@ -2490,7 +2512,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2503,17 +2525,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
-  : get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name/
+  : post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2525,18 +2554,32 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2548,24 +2591,30 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2577,12 +2626,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
         201:
           description: "Object created"
@@ -2593,8 +2652,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -2606,12 +2667,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2628,6 +2699,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerManagementConfigPac"
@@ -2651,6 +2727,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
         description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
@@ -2681,6 +2762,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
         description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
@@ -2711,12 +2797,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-maximum-input-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-maximum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2735,6 +2826,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -2760,6 +2856,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -2791,6 +2892,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -2822,12 +2928,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-minimum-input-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-minimum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2846,6 +2957,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -2871,6 +2987,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -2902,6 +3023,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -2933,12 +3059,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-maximum-output-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-maximum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -2957,6 +3088,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -2982,6 +3118,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -3013,6 +3154,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -3044,12 +3190,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-minimum-output-power/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-minimum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -3068,6 +3219,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.photonic.media.PowerProperties"
@@ -3093,6 +3249,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added to list"
@@ -3124,6 +3285,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.photonic.media.PowerProperties.body-param"
         description: "tapi.photonic.media.PowerProperties to be added or updated"
@@ -3155,15 +3321,474 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        400:
+          description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.MediaChannelConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name/
+  : post:
+      tags:
+      - "tapi-photonic-media"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -3192,10 +3817,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name={value-name}/
+  : get:
       tags:
-      - "tapi-connectivity"
+      - "tapi-photonic-media"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -3225,7 +3850,7 @@ paths:
           description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
+      - "tapi-photonic-media"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -3261,7 +3886,2591 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerManagementConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-maximum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-minimum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-maximum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-minimum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerManagementConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-maximum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-minimum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-maximum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-minimum-output-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCsepCommonPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCsepCtpPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCsepTtpPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepTtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/:
+    get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
+          \ be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
+          \ be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.OtsiTerminationConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/application-identifier/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.ApplicationIdentifier"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.CentralFrequency"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -3277,6 +6486,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -3287,11 +6501,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
-    get:
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3304,17 +6518,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3327,12 +6546,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
       responses:
         201:
           description: "Object created"
@@ -3342,8 +6566,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3356,12 +6580,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
       responses:
         201:
           description: "Object created"
@@ -3371,53 +6600,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduCsepCommonPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3430,52 +6614,21 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
+      - name: "otsi-config-local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of otsi-config"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
       responses:
-        201:
-          description: "Object created"
         400:
           description: "Internal error"
         204:
-          description: "Object modified"
-    delete:
+          description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/frequency-constraint/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3488,39 +6641,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCtpPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
+      - name: "otsi-config-local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepCtpPac"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3533,12 +6669,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
       responses:
         201:
           description: "Object created"
@@ -3548,8 +6689,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3562,12 +6703,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
       responses:
         201:
           description: "Object created"
@@ -3577,8 +6723,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCtpPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3591,17 +6737,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/transmit-power/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3613,18 +6764,23 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepTtpPac"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3636,12 +6792,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
       responses:
         201:
           description: "Object created"
@@ -3651,9 +6812,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3665,12 +6826,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
       responses:
         201:
           description: "Object created"
@@ -3680,9 +6846,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepTtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3694,6 +6860,11 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
@@ -4222,6 +7393,133 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name/
+  : post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValue"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValue"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
   ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/spectrum/
   : get:
       tags:
@@ -27537,6 +30835,89 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
+  /data/context/virtual-network-context/virtual-nw-service={uuid}/schedule/:
+    get:
+      tags:
+      - "tapi-virtual-network"
+      summary: "returns tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.TimeRange"
+          schema:
+            $ref: "#/definitions/tapi.common.TimeRange"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-virtual-network"
+      summary: "creates tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRange"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-virtual-network"
+      summary: "creates or updates tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRange"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-virtual-network"
+      summary: "removes tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
   /data/context/virtual-network-context/virtual-nw-service={uuid}/state/:
     get:
       tags:
@@ -30709,8 +34090,8 @@ definitions:
           format: "int32"
           description: "Value of 0 (zero) means 'unspecified priority'.\r\n      \
             \          Highest priority is 1, sometimes referred as 'preferred' or\
-            \ 'main' or 'intended' route.\r\n                Then 2 has lower priory\
-            \ than 1, 3 has lower priory than 2, etc."
+            \ 'main' or 'intended' route.\r\n                2 has lower priority\
+            \ than 1, 3 has lower priority than 2, etc."
         route-state:
           type: "string"
           description: "Current information on the route selection."
@@ -30735,10 +34116,10 @@ definitions:
         resilience-route-pac:
           description: "Provides optional resilience and state attributes to the Route."
           $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
-      description: "The FC Route (FcRoute) object class models the individual routes\
-        \ of an FC. \r\n            The route of an FC object is represented by a\
-        \ list of FCs at a lower level. \r\n            Note that depending on the\
-        \ service supported by an FC, an the FC can have multiple routes."
+      description: "The Route of a Connection is modeled as a collection of Connection\
+        \ End Points.\r\n            The logical order of the Connection End Points\
+        \ within the Route object can be inferred by the TAPI client by the knowledge\
+        \ of the Topology information."
   tapi.connectivity.RouteRef:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionRef"
@@ -30897,6 +34278,8 @@ definitions:
     - $ref: "#/definitions/tapi.odu.EndPointAugmentation1"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation2"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation3"
+    - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation4"
+    - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation5"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -32742,45 +36125,45 @@ definitions:
   tapi.eth.OamJobAugmentation1:
     type: "object"
     properties:
-      eth-loopback-job:
+      eth-test-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+        $ref: "#/definitions/tapi.eth.EthTestJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation2:
     type: "object"
     properties:
-      eth-test-job:
+      eth-on-demand-2way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthTestJob"
+        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation3:
     type: "object"
     properties:
-      eth-link-trace-job:
+      eth-pro-active-1way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+        $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation4:
     type: "object"
     properties:
-      eth-on-demand-1way-measurement-job:
+      eth-loopback-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation5:
     type: "object"
     properties:
-      eth-on-demand-2way-measurement-job:
+      eth-link-trace-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -32796,9 +36179,9 @@ definitions:
   tapi.eth.OamJobAugmentation7:
     type: "object"
     properties:
-      eth-pro-active-1way-measurement-job:
+      eth-on-demand-1way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -32871,45 +36254,45 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation1:
     type: "object"
     properties:
-      eth-loopback-result-data:
+      eth-test-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
+        $ref: "#/definitions/tapi.eth.EthTestResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation10:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      eth-on-demand-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation11:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      eth-on-demand-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      eth-pro-active-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation3:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      eth-pro-active-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -32925,90 +36308,90 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation5:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      eth-loopback-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation6:
     type: "object"
     properties:
-      eth-test-result-data:
+      eth-pro-active-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthTestResultData"
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      eth-on-demand-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation8:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      eth-on-demand-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation9:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      eth-pro-active-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation1:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      eth-on-demand-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      eth-on-demand-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation3:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      eth-on-demand-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation4:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      eth-pro-active-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation5:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      eth-pro-active-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -33024,54 +36407,54 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      eth-on-demand-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation8:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      eth-pro-active-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation1:
     type: "object"
     properties:
-      eth-dm-threshold-data:
+      eth-1-dm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+        $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation2:
     type: "object"
     properties:
-      eth-lm-threshold-data:
+      eth-dm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation3:
     type: "object"
     properties:
-      eth-1-dm-threshold-data:
+      eth-1-lm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation4:
     type: "object"
     properties:
-      eth-1-lm-threshold-data:
+      eth-lm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+        $ref: "#/definitions/tapi.eth.EthLmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -33549,6 +36932,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
@@ -35625,6 +39009,24 @@ definitions:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation3:
+    type: "object"
+    properties:
+      media-channel-aconnectivity-service-end-point-spec:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+    x-augmentation:
+      prefix: "tapi-photonic-media"
+      namespace: "urn:onf:otcc:yang:tapi-photonic-media"
+  tapi.photonic.media.EndPointAugmentation4:
+    type: "object"
+    properties:
+      otsi-aconnectivity-service-end-point-spec:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+    x-augmentation:
+      prefix: "tapi-photonic-media"
+      namespace: "urn:onf:otcc:yang:tapi-photonic-media"
+  tapi.photonic.media.EndPointAugmentation5:
     type: "object"
     properties:
       otsi-connectivity-service-end-point-spec:
@@ -35716,14 +39118,41 @@ definitions:
     - "PUMP"
     - "MODULATED"
     - "PULSE"
-  tapi.photonic.media.MediaChannelAssemblySpec:
-    type: "object"
-  tapi.photonic.media.MediaChannelConfigPac:
+  tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec:
     type: "object"
     properties:
-      spectrum:
+      number-of-mc:
+        type: "integer"
+        format: "int32"
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        default: 1
+      mc-config:
+        type: "array"
+        description: "none"
+        items:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+      capacity:
+        description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+          \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+          \ be omitted if spectrum is not specified."
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.photonic.media.MediaChannelAssemblySpec:
+    type: "object"
+  tapi.photonic.media.MediaChannelConfigPac:
+    allOf:
+    - $ref: "#/definitions/tapi.common.LocalClass"
+    - type: "object"
+      properties:
+        spectrum:
+          description: "none"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        power-management-config-pac:
+          description: "none"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+      description: "This class allows the provisioning of the parameters of a single\
+        \ MC / OTSiMC.\r\n            The [1..*] with MediaChannelAConnectivityServiceEndPointSpec\
+        \ allows the configuration of power properties (PowerManagementConfigPac)\
+        \ even in case of no spectrum specified, i.e. 'empty' MediaChannelConfigPac."
   tapi.photonic.media.MediaChannelConnectionEndPointSpec:
     type: "object"
     properties:
@@ -35812,6 +39241,19 @@ definitions:
       ots-media-channel:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+  tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec:
+    type: "object"
+    properties:
+      otsi-config:
+        type: "array"
+        description: "none"
+        items:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      number-of-otsi:
+        type: "integer"
+        format: "int32"
+        description: "none"
+        default: 1
   tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec:
     type: "object"
     properties:
@@ -35876,37 +39318,43 @@ definitions:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
   tapi.photonic.media.OtsiTerminationConfigPac:
-    type: "object"
-    properties:
-      application-identifier:
-        description: "This attribute indicates the selected Application Identifier."
-        $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
-      central-frequency:
-        description: "The central frequency of the laser. It is the oscillation frequency\
-          \ of the corresponding electromagnetic wave"
-        $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
-      modulation:
-        description: "The modulation techniqu selected at the source."
-        $ref: "#/definitions/tapi.photonic.media.ModulationTechnique"
-      spectrum:
-        description: "none"
-        $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
-      laser-control:
-        description: "Laser control can be FORCED-ON, FORCED-OFF or LASER-SHUTDOWN"
-        $ref: "#/definitions/tapi.photonic.media.LaserControlType"
-      total-power-warn-threshold-lower:
-        type: "string"
-        description: "Allows to configure the Lowerpower threshold which is expected\
-          \ to be different from Default, but within the Min and Max values specified\
-          \ as OTSi SIP capability."
-      total-power-warn-threshold-upper:
-        type: "string"
-        description: "Allows to configure the Upper power threshold which is expected\
-          \ to be different from Default, but within the Min and Max values specified\
-          \ as OTSi SIP capability."
-      transmit-power:
-        description: "Transmit power as requested."
-        $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+    allOf:
+    - $ref: "#/definitions/tapi.common.LocalClass"
+    - type: "object"
+      properties:
+        application-identifier:
+          description: "This attribute indicates the selected Application Identifier."
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+        central-frequency:
+          description: "The central frequency of the laser. It is the oscillation\
+            \ frequency of the corresponding electromagnetic wave"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+        modulation:
+          description: "The modulation techniqu selected at the source."
+          $ref: "#/definitions/tapi.photonic.media.ModulationTechnique"
+        spectrum:
+          description: "none"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        laser-control:
+          description: "Laser control can be FORCED-ON, FORCED-OFF or LASER-SHUTDOWN"
+          $ref: "#/definitions/tapi.photonic.media.LaserControlType"
+        total-power-warn-threshold-lower:
+          type: "string"
+          description: "Allows to configure the Lowerpower threshold which is expected\
+            \ to be different from Default, but within the Min and Max values specified\
+            \ as OTSi SIP capability."
+        total-power-warn-threshold-upper:
+          type: "string"
+          description: "Allows to configure the Upper power threshold which is expected\
+            \ to be different from Default, but within the Min and Max values specified\
+            \ as OTSi SIP capability."
+        transmit-power:
+          description: "Transmit power as requested."
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+      description: "This class allows the provisioning of the parameters of a single\
+        \ OTSi.\r\n            In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec),\
+        \ it is intended that the choice of the parameter values is fully delegated\
+        \ to the server controller."
   tapi.photonic.media.OtsiTerminationPac:
     type: "object"
     properties:
@@ -36121,14 +39569,14 @@ definitions:
           type: "string"
           description: "Names the connection protocol for this particular available\
             \ stream.\r\n                The connection protocol is chosen from the\
-            \ lost of connecion protocols identified in the referenced SupportedStreamType."
+            \ list of connection protocols identified in the referenced SupportedStreamType."
         supported-stream-type:
           description: "Identifies the type of stream that is available for connection."
           $ref: "#/definitions/tapi.streaming.SupportedStreamTypeRef"
         connection-address:
           type: "string"
           description: "Provides the address for the connection. \r\n            \
-            \    The format of the address and attachment mechnism will depend on\
+            \    The format of the address and attachment mechanism will depend on\
             \ the connection protocol defined in another attribute of this class."
         stream-id:
           type: "string"
@@ -36176,18 +39624,18 @@ definitions:
   tapi.streaming.ContextAugmentation1:
     type: "object"
     properties:
-      stream-admin-context:
+      stream-context:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.StreamAdminContext"
+        $ref: "#/definitions/tapi.streaming.context.StreamContext"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
   tapi.streaming.ContextAugmentation2:
     type: "object"
     properties:
-      stream-context:
+      stream-admin-context:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.context.StreamContext"
+        $ref: "#/definitions/tapi.streaming.StreamAdminContext"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
@@ -36315,7 +39763,7 @@ definitions:
           description: "Name of the stream type."
         segment-size:
           type: "string"
-          description: "Size of substructuring of the log."
+          description: "Size of sub-structuring of the log."
         record-retention:
           type: "string"
           description: "Time in minutes.\r\n                Statement of retention\
@@ -36327,18 +39775,18 @@ definitions:
   tapi.streaming.SupportedStreamTypeAugmentation1:
     type: "object"
     properties:
-      compacted-log-details:
+      connection-protocol-details:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
+        $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
   tapi.streaming.SupportedStreamTypeAugmentation2:
     type: "object"
     properties:
-      connection-protocol-details:
+      compacted-log-details:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
+        $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
@@ -37259,8 +40707,8 @@ definitions:
     - type: "object"
       properties:
         schedule:
-          type: "string"
           description: "none"
+          $ref: "#/definitions/tapi.common.TimeRange"
         end-point:
           type: "array"
           description: "none"
@@ -37327,8 +40775,8 @@ definitions:
     type: "object"
     properties:
       conn-schedule:
-        type: "string"
         description: "none"
+        $ref: "#/definitions/tapi.common.TimeRange"
       vnw-constraint:
         description: "none"
         $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
diff --git a/OAS/tapi-topology@2020-04-23.yaml b/OAS/tapi-topology@2020-04-23.yaml
index ab6d163d..533e1c35 100644
--- a/OAS/tapi-topology@2020-04-23.yaml
+++ b/OAS/tapi-topology@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -5934,6 +5935,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
diff --git a/OAS/tapi-virtual-network@2020-04-23.yaml b/OAS/tapi-virtual-network@2020-04-23.yaml
index 2c9df5f2..d9eb6ba4 100644
--- a/OAS/tapi-virtual-network@2020-04-23.yaml
+++ b/OAS/tapi-virtual-network@2020-04-23.yaml
@@ -5,16 +5,17 @@ info:
     \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\
-    \n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n          As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n          The YANG\
-    \ model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n          YANG models included in this release may not be backward compatible\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
@@ -5631,6 +5632,89 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
+  /data/context/virtual-network-context/virtual-nw-service={uuid}/schedule/:
+    get:
+      tags:
+      - "tapi-virtual-network"
+      summary: "returns tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.TimeRange"
+          schema:
+            $ref: "#/definitions/tapi.common.TimeRange"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-virtual-network"
+      summary: "creates tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRange"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-virtual-network"
+      summary: "creates or updates tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRange"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-virtual-network"
+      summary: "removes tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of virtual-nw-service"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
   /data/context/virtual-network-context/virtual-nw-service={uuid}/state/:
     get:
       tags:
@@ -7665,6 +7749,15 @@ definitions:
     - "TERMINATED_BIDIRECTIONAL"
     - "LT_PERMENANTLY_TERMINATED"
     - "TERMINATION_STATE_UNKNOWN"
+  tapi.common.TimeRange:
+    type: "object"
+    properties:
+      end-time:
+        type: "string"
+        description: "none"
+      start-time:
+        type: "string"
+        description: "none"
   tapi.common.getserviceinterfacepointdetails.Input:
     type: "object"
     properties:
@@ -7914,6 +8007,7 @@ definitions:
     - "HOLDER"
     - "PHYSICAL_SPAN"
     - "ABSTRACT_STRAND"
+    - "DEVICE"
   tapi.notification.PerceivedSeverityType:
     type: "string"
     enum:
@@ -8897,8 +8991,8 @@ definitions:
     - type: "object"
       properties:
         schedule:
-          type: "string"
           description: "none"
+          $ref: "#/definitions/tapi.common.TimeRange"
         end-point:
           type: "array"
           description: "none"
@@ -8965,8 +9059,8 @@ definitions:
     type: "object"
     properties:
       conn-schedule:
-        type: "string"
         description: "none"
+        $ref: "#/definitions/tapi.common.TimeRange"
       vnw-constraint:
         description: "none"
         $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"

From b37d792e32771a25d2d189b19d935659ae8f4aa7 Mon Sep 17 00:00:00 2001
From: amazzini <andrea.mazzini@nokia.com>
Date: Thu, 18 Jun 2020 01:40:57 +0200
Subject: [PATCH 6/6] Adjustments agreed at TAPI call 2020-06-16:

1) supportable-central-frequency-spectrum-band instead of
supportable-lower-central-frequency, supportable-upper-central-frequency

1.1) added keys lower/upper frequency to CentralFrequencyBand type

2) removed redundant association between
MediaChannelConnectivityServiceEndPointSpec and PowerManagementConfigPac

3) renamed (through Papyrus) the YANG/OAS modules which have been
modified with respect to RC1 ones (connectivity, notification, photonic
media, streaming, virtual ntw)
---
 OAS/tapi-common@2020-04-23.yaml               |   126 +-
 ...yaml => tapi-connectivity@2020-06-16.yaml} |  7098 ++---
 OAS/tapi-dsr@2020-04-23.yaml                  |  4980 ++--
 OAS/tapi-equipment@2020-04-23.yaml            |  3246 ++-
 OAS/tapi-eth@2020-04-23.yaml                  |  9370 ++++---
 ...yaml => tapi-notification@2020-06-16.yaml} |  1186 +-
 OAS/tapi-oam@2020-04-23.yaml                  |  4972 ++--
 OAS/tapi-odu@2020-04-23.yaml                  |  5372 ++--
 OAS/tapi-path-computation@2020-04-23.yaml     |  3218 ++-
 ...ml => tapi-photonic-media@2020-06-16.yaml} | 16556 ++++++-----
 ...23.yaml => tapi-streaming@2020-06-16.yaml} | 22851 ++++++++--------
 OAS/tapi-topology@2020-04-23.yaml             |  1884 +-
 ...l => tapi-virtual-network@2020-06-16.yaml} |  2212 +-
 UML/TapiConnectivity.notation                 |  9364 +++----
 UML/TapiPhotonicMedia.notation                |  1747 +-
 UML/TapiPhotonicMedia.uml                     |    67 +-
 UML/TapiTopology.notation                     |  1299 +-
 ...tree => tapi-connectivity@2020-06-16.tree} |     0
 ...yang => tapi-connectivity@2020-06-16.yang} |     2 +-
 ...tree => tapi-notification@2020-06-16.tree} |     0
 ...yang => tapi-notification@2020-06-16.yang} |     2 +-
 ...ee => tapi-photonic-media@2020-06-16.tree} |   465 +-
 ...ng => tapi-photonic-media@2020-06-16.yang} |    53 +-
 ...23.tree => tapi-streaming@2020-06-16.tree} |     0
 ...23.yang => tapi-streaming@2020-06-16.yang} |     2 +-
 ...e => tapi-virtual-network@2020-06-16.tree} |     0
 ...g => tapi-virtual-network@2020-06-16.yang} |     2 +-
 27 files changed, 49496 insertions(+), 46578 deletions(-)
 rename OAS/{tapi-connectivity@2020-04-23.yaml => tapi-connectivity@2020-06-16.yaml} (86%)
 rename OAS/{tapi-notification@2020-04-23.yaml => tapi-notification@2020-06-16.yaml} (87%)
 rename OAS/{tapi-photonic-media@2020-04-23.yaml => tapi-photonic-media@2020-06-16.yaml} (86%)
 rename OAS/{tapi-streaming@2020-04-23.yaml => tapi-streaming@2020-06-16.yaml} (86%)
 rename OAS/{tapi-virtual-network@2020-04-23.yaml => tapi-virtual-network@2020-06-16.yaml} (84%)
 rename YANG/{tapi-connectivity@2020-04-23.tree => tapi-connectivity@2020-06-16.tree} (100%)
 rename YANG/{tapi-connectivity@2020-04-23.yang => tapi-connectivity@2020-06-16.yang} (97%)
 rename YANG/{tapi-notification@2020-04-23.tree => tapi-notification@2020-06-16.tree} (100%)
 rename YANG/{tapi-notification@2020-04-23.yang => tapi-notification@2020-06-16.yang} (97%)
 rename YANG/{tapi-photonic-media@2020-04-23.tree => tapi-photonic-media@2020-06-16.tree} (70%)
 rename YANG/{tapi-photonic-media@2020-04-23.yang => tapi-photonic-media@2020-06-16.yang} (94%)
 rename YANG/{tapi-streaming@2020-04-23.tree => tapi-streaming@2020-06-16.tree} (100%)
 rename YANG/{tapi-streaming@2020-04-23.yang => tapi-streaming@2020-06-16.yang} (97%)
 rename YANG/{tapi-virtual-network@2020-04-23.tree => tapi-virtual-network@2020-06-16.tree} (100%)
 rename YANG/{tapi-virtual-network@2020-04-23.yang => tapi-virtual-network@2020-06-16.yang} (97%)

diff --git a/OAS/tapi-common@2020-04-23.yaml b/OAS/tapi-common@2020-04-23.yaml
index 7dd36991..9d3cb6d5 100644
--- a/OAS/tapi-common@2020-04-23.yaml
+++ b/OAS/tapi-common@2020-04-23.yaml
@@ -18,7 +18,7 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
+  version: "2.1.3"
   title: "tapi-common API"
 host: "localhost:1234"
 consumes:
@@ -26,7 +26,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -37,7 +37,7 @@ paths:
         200:
           description: "tapi.common.TapiContext"
           schema:
-            $ref: "#/definitions/tapi.common.TapiContext"
+            $ref: "#/definitions/tapi.common.TapiContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -51,7 +51,7 @@ paths:
         description: "tapi.common.TapiContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TapiContext"
+          $ref: "#/definitions/tapi.common.TapiContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -70,7 +70,7 @@ paths:
         description: "tapi.common.TapiContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TapiContext"
+          $ref: "#/definitions/tapi.common.TapiContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -89,7 +89,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/name/:
     post:
       tags:
       - "tapi-common"
@@ -103,7 +103,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -111,7 +111,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -129,7 +129,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -150,7 +150,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -176,7 +176,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point/:
+  /data/tapi-common:context/service-interface-point/:
     post:
       tags:
       - "tapi-common"
@@ -188,7 +188,7 @@ paths:
         description: "tapi.common.ServiceInterfacePoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -196,7 +196,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
       - "tapi-common"
@@ -212,7 +212,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
     put:
@@ -231,7 +231,7 @@ paths:
         description: "tapi.common.ServiceInterfacePoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -255,7 +255,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
       - "tapi-common"
@@ -271,10 +271,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-common"
@@ -290,10 +290,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
       - "tapi-common"
@@ -309,10 +309,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
       - "tapi-common"
@@ -328,10 +328,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
       - "tapi-common"
@@ -347,10 +347,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
       - "tapi-common"
@@ -366,10 +366,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-common"
@@ -386,10 +386,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
     post:
       tags:
       - "tapi-common"
@@ -408,7 +408,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -416,7 +416,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -439,7 +439,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -465,7 +465,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -496,7 +496,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-common"
@@ -513,10 +513,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-common"
@@ -532,10 +532,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
       - "tapi-common"
@@ -551,10 +551,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
       - "tapi-common"
@@ -570,10 +570,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
       - "tapi-common"
@@ -589,10 +589,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
       - "tapi-common"
@@ -608,10 +608,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-common"
@@ -628,10 +628,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
       - "tapi-common"
@@ -654,7 +654,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
       - "tapi-common"
@@ -668,7 +668,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
       - "tapi-common"
@@ -738,6 +738,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -781,6 +785,14 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.GetServiceInterfacePointDetails:
     type: "object"
     properties:
@@ -835,6 +847,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -871,6 +887,10 @@ definitions:
         \ termination and adaptation functions of one or more transport layers. \r\
         \n            The structure of LTP supports all transport protocols including\
         \ circuit and packet forms."
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -885,6 +905,10 @@ definitions:
         \ of control that a particular SDN controller has with respect to a particular\
         \ network, (i.e., encompassing a designated set of interconnected (virtual)\
         \ network elements)."
+  tapi.common.TapiContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.TapiContext"
   tapi.common.getserviceinterfacepointdetails.Input:
     type: "object"
     properties:
diff --git a/OAS/tapi-connectivity@2020-04-23.yaml b/OAS/tapi-connectivity@2020-06-16.yaml
similarity index 86%
rename from OAS/tapi-connectivity@2020-04-23.yaml
rename to OAS/tapi-connectivity@2020-06-16.yaml
index 89769f8d..6cc5d390 100644
--- a/OAS/tapi-connectivity@2020-04-23.yaml
+++ b/OAS/tapi-connectivity@2020-06-16.yaml
@@ -1,11 +1,28 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Connectivity Model definitions.\r\
-    \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
+    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
+    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
+    \n        - The YANG specifications have been generated from the corresponding\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
     \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
@@ -35,24 +52,7 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
-    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
-    \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
-    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
-    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
-    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
-    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
-    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
-    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -86,8 +86,8 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
-  title: "tapi-connectivity,tapi-topology,tapi-notification,tapi-common,tapi-path-computation\
+  version: "2.1.3"
+  title: "tapi-notification,tapi-connectivity,tapi-topology,tapi-common,tapi-path-computation\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -95,7 +95,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -106,7 +106,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -120,7 +120,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -139,7 +139,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -158,32 +158,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -191,18 +180,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -212,360 +229,266 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ResilienceRoute"
-      description: "Provides optional resilience and state attributes to the Route."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ResilienceRoute"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
-        400:
-          description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControl"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.SwitchControl"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-connectivity"
+      - "tapi-common"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -573,12 +496,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -590,118 +508,51 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.ResilienceType"
-          schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
-  : get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControlRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of sub-switch-control"
-        required: true
-        type: "string"
-      - name: "sub-switch-control-switch-control-uuid"
-        in: "path"
-        description: "Id of sub-switch-control"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.connectivity.SwitchControlRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
-        400:
-          description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
-    get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Switch"
-      description: "none"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of switch"
+        description: "Id of name"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.Switch"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of switch"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -710,239 +561,171 @@ paths:
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of switch"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of selected-connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of selected-connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of selected-connection-end-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.RouteRef"
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of switch"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of selected-route"
-        required: true
-        type: "string"
-      - name: "route-local-id"
-        in: "path"
-        description: "Id of selected-route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.RouteRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityService.body-param"
-        description: "tapi.connectivity.ConnectivityService to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityService"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityService.body-param"
-        description: "tapi.connectivity.ConnectivityService to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
+      summary: "returns tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceRef"
+          description: "tapi.connectivity.ConnectivityContext"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      summary: "creates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -953,20 +736,15 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      summary: "creates or updates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -977,574 +755,610 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
+      summary: "removes tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.connectivity.Connection"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "node-edge-point-uuid"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of connection"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of lower-connection"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "connectivity-service-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceRef"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
+      summary: "returns tapi.connectivity.Route"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "connectivity-service-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of route"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceRef"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "connectivity-service-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPoint"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPoint.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPoint to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPoint"
-      description: "none"
+      summary: "returns tapi.connectivity.ResilienceRoute"
+      description: "Provides optional resilience and state attributes to the Route."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPoint"
+          description: "tapi.connectivity.ResilienceRoute"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPoint"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPoint.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPoint to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPoint"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supported-client-link"
+        required: true
+        type: "string"
+      - name: "link-uuid"
+        in: "path"
+        description: "Id of supported-client-link"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.Capacity"
+      summary: "returns tapi.connectivity.SwitchControl"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.connectivity.SwitchControl"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.Capacity"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.Capacity"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.Capacity"
+      summary: "returns tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.Capacity"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.ResilienceType"
+          schema:
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.Capacity"
+      summary: "returns tapi.connectivity.SwitchControlRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of sub-switch-control"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "sub-switch-control-switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of sub-switch-control"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.SwitchControlRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.BandwidthProfile"
+      summary: "returns tapi.connectivity.Switch"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.connectivity.Switch"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.BandwidthProfile"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.BandwidthProfile"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.BandwidthProfile"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of selected-connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of selected-connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.connectivity.RouteRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of selected-route"
+        required: true
+        type: "string"
+      - name: "route-local-id"
+        in: "path"
+        description: "Id of selected-route"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.connectivity.RouteRef"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
         400:
           description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.connectivity.ConnectivityService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.connectivity.ConnectivityService.body-param"
+        description: "tapi.connectivity.ConnectivityService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -1552,10 +1366,11 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "returns tapi.connectivity.ConnectivityService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1563,17 +1378,30 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityService"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityService"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.connectivity.ConnectivityService.body-param"
+        description: "tapi.connectivity.ConnectivityService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -1584,7 +1412,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.connectivity.ConnectivityService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1592,21 +1420,16 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.connectivity.ConnectionRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1614,22 +1437,23 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.connectivity.ConnectionRef"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "returns tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1637,17 +1461,30 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityServiceRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1658,7 +1495,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1666,17 +1503,12 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1687,7 +1519,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1695,91 +1527,85 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+      - in: "body"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
+      responses:
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.CostCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1790,17 +1616,18 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
@@ -1808,11 +1635,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "creates tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1820,22 +1647,24 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "returns tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1843,28 +1672,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectivityServiceRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1872,17 +1695,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1893,7 +1716,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1901,9 +1724,9 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
       responses:
@@ -1911,37 +1734,38 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityServiceEndPoint.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPoint to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -1953,25 +1777,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectivityServiceEndPoint"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -1984,11 +1801,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPoint.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPoint to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1999,9 +1817,8 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -2018,11 +1835,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2035,41 +1852,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.common.Capacity"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -2082,11 +1876,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2094,44 +1888,11 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.common.Capacity"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -2143,17 +1904,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2163,11 +1919,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.Capacity"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -2179,21 +1933,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2208,15 +1957,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2230,12 +1979,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -2246,7 +1994,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2260,12 +2008,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -2276,7 +2023,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2294,11 +2041,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2313,15 +2060,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2335,12 +2082,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2351,7 +2097,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2365,12 +2111,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2381,7 +2126,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2399,11 +2144,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2418,15 +2163,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2440,12 +2185,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2456,7 +2200,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2470,12 +2214,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2486,7 +2229,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2504,11 +2247,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2523,15 +2266,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2545,11 +2288,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2560,7 +2303,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2574,11 +2317,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2589,7 +2332,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2607,80 +2350,81 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2691,18 +2435,17 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -2710,42 +2453,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2756,20 +2511,26 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2780,55 +2541,94 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2836,23 +2636,66 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2863,24 +2706,36 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2888,17 +2743,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2906,12 +2766,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2922,7 +2788,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2930,12 +2796,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2946,7 +2818,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2954,88 +2826,93 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3046,19 +2923,17 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -3066,11 +2941,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.Capacity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3078,17 +2953,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.Capacity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3096,12 +2976,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3112,7 +2998,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.Capacity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3120,12 +3006,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3136,7 +3028,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.Capacity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3144,34 +3036,44 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.BandwidthProfile"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.BandwidthProfile"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3179,12 +3081,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3195,7 +3102,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.BandwidthProfile"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3203,12 +3110,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3219,7 +3131,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.BandwidthProfile"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3227,71 +3139,90 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LatencyCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3302,24 +3233,30 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3329,15 +3266,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3346,11 +3283,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3361,7 +3298,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3370,11 +3307,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3385,7 +3322,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3398,12 +3335,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3412,16 +3349,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3429,11 +3366,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3444,8 +3381,8 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3453,11 +3390,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3468,8 +3405,8 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -3481,11 +3418,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3495,15 +3432,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3512,11 +3449,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3527,7 +3464,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3536,11 +3473,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3551,7 +3488,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3564,69 +3501,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
-    get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3637,25 +3588,31 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3665,15 +3622,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.topology.ResilienceType"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.ResilienceType"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3682,11 +3639,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.ResilienceType.body-param"
-        description: "tapi.topology.ResilienceType to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3697,7 +3654,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.ResilienceType"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3706,11 +3663,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.ResilienceType.body-param"
-        description: "tapi.topology.ResilienceType to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3721,7 +3678,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.ResilienceType"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3734,11 +3691,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.RiskCharacteristic"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3746,24 +3703,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3771,22 +3721,23 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3794,17 +3745,12 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3815,7 +3761,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.RiskCharacteristic"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3823,21 +3769,16 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.TimeRange"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3847,15 +3788,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimeRange"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.TimeRange"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3864,11 +3805,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3879,7 +3820,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.TimeRange"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3888,11 +3829,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3903,7 +3844,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.TimeRange"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3916,68 +3857,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
-      - name: "value-name"
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
-      - name: "value-name"
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3987,15 +3926,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
-      - name: "value-name"
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -4003,32 +3940,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationContext"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4038,16 +3985,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4057,73 +4009,80 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.notification.NotificationSubscriptionService"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4133,13 +4092,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -4147,83 +4106,69 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4233,20 +4178,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -4254,277 +4193,348 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.ResilienceType"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.ResilienceType.body-param"
+        description: "tapi.topology.ResilienceType to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "notification-uuid"
+      - in: "body"
+        name: "tapi.topology.ResilienceType.body-param"
+        description: "tapi.topology.ResilienceType to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.ResilienceType"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.notification.Notification"
-          schema:
-            $ref: "#/definitions/tapi.notification.Notification"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "notification-uuid"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of additional-info"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "notification-uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of notification"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.notification.AlarmInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.notification.NameAndValueChange"
-          schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.TimeRange"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.notification.SubscriptionFilter"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters:
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters:
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
+    post:
+      tags:
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4532,10 +4542,29 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NotificationSubscriptionService"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4544,11 +4573,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4559,7 +4589,7 @@ paths:
     delete:
       tags:
       - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4572,7 +4602,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4591,7 +4621,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4599,7 +4629,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4622,7 +4652,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4648,18 +4678,61 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationChannel"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NotificationChannel"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
+      summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
@@ -4675,11 +4748,13 @@ paths:
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4687,6 +4762,11 @@ paths:
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4695,17 +4775,22 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4719,17 +4804,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4738,17 +4828,22 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4762,11 +4857,11 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4775,6 +4870,11 @@ paths:
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4788,17 +4888,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4812,17 +4917,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -4831,88 +4941,45 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathComputationContext"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
-      responses:
-        201:
-          description: "Object created"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationService"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added to\
-          \ list"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4920,43 +4987,23 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationService"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathComputationService"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationService"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added or\
-          \ updated"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4966,13 +5013,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationService"
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
@@ -4980,24 +5027,26 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathServiceEndPoint"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5005,229 +5054,268 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathServiceEndPoint"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathServiceEndPoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
         400:
           description: "Internal error"
         204:
-          description: "Object modified"
-    delete:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathServiceEndPoint"
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.Notification"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.Capacity"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.Capacity"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.Capacity"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.AlarmInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.Capacity"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.Capacity"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.Capacity"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of notification"
         required: true
         type: "string"
+      responses:
+        200:
+          description: "tapi.notification.TcaInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.path.computation.PathComputationContext"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters:
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -5238,25 +5326,16 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.BandwidthProfile"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -5267,52 +5346,40 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.BandwidthProfile"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      summary: "removes tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "creates tapi.path.computation.PathComputationService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
+    get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "returns tapi.path.computation.PathComputationService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5320,28 +5387,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.PathComputationService"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.path.computation.PathComputationService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5349,17 +5405,13 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -5370,7 +5422,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.path.computation.PathComputationService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5378,21 +5430,16 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "creates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5400,22 +5447,24 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+    get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "returns tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5428,23 +5477,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.PathServiceEndPoint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5458,11 +5501,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -5473,7 +5516,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5491,11 +5534,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5510,15 +5553,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5532,11 +5575,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -5547,7 +5590,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5561,11 +5604,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -5576,7 +5619,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5594,11 +5637,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5613,15 +5656,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5635,11 +5678,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -5650,7 +5693,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5664,11 +5707,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -5679,7 +5722,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5697,13 +5740,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5719,15 +5761,14 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
       summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5744,7 +5785,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5756,8 +5797,7 @@ paths:
       tags:
       - "tapi-path-computation"
       summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5774,7 +5814,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5786,8 +5826,7 @@ paths:
       tags:
       - "tapi-path-computation"
       summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5804,14 +5843,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5823,27 +5860,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5855,25 +5883,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5885,17 +5912,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5906,10 +5928,8 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5921,21 +5941,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5950,15 +5965,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5972,11 +5987,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5987,7 +6002,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6001,11 +6016,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6016,7 +6031,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6034,83 +6049,81 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6121,19 +6134,17 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -6141,42 +6152,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
-      description: "none"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathObjectiveFunction"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6187,20 +6210,26 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6211,20 +6240,26 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -6238,12 +6273,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.common.NameAndValue.body-param"
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6251,8 +6291,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -6265,6 +6305,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -6274,7 +6319,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6290,6 +6335,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -6300,7 +6350,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6321,6 +6371,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -6331,11 +6386,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6343,17 +6398,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6361,13 +6421,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6378,7 +6442,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6386,13 +6450,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6403,7 +6471,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6411,12 +6479,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -6435,7 +6508,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6443,7 +6516,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -6466,7 +6539,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6481,132 +6554,18 @@ paths:
         in: "path"
         description: "Id of path-comp-service"
         required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+        type: "string"
+      - name: "value-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6617,93 +6576,86 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
-      description: "none"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
+    get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.PathObjectiveFunction"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -6714,32 +6666,27 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6747,11 +6694,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6759,54 +6706,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6817,18 +6766,19 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -6836,11 +6786,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6850,15 +6800,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6867,11 +6817,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -6882,7 +6833,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6891,11 +6842,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -6906,7 +6858,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6919,66 +6871,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6989,24 +6958,55 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7016,15 +7016,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7033,11 +7033,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -7048,7 +7048,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7057,11 +7057,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -7072,7 +7072,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7085,12 +7085,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7098,11 +7099,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -7110,52 +7111,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.RiskCharacteristic"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -7166,17 +7169,18 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
@@ -7184,66 +7188,80 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.TopologyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LatencyCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -7254,202 +7272,193 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.Path"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of link"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.CostCharacteristic"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.path.computation.ValueOrPriority"
@@ -7457,53 +7466,33 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -7511,42 +7500,23 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePoint"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -7556,13 +7526,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -7570,235 +7540,248 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.common.Capacity"
-          schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of link"
+        required: true
+        type: "string"
+      - name: "link-uuid"
+        in: "path"
+        description: "Id of link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       - name: "value-name"
@@ -7807,146 +7790,163 @@ paths:
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -7957,7 +7957,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -7971,7 +7971,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -7990,7 +7990,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -8009,7 +8009,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -8020,10 +8020,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -8041,10 +8041,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -8060,10 +8060,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -8079,10 +8079,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -8103,10 +8103,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -8127,10 +8127,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -8151,11 +8151,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8175,10 +8175,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -8199,11 +8199,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8223,11 +8223,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8247,10 +8247,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -8272,10 +8272,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -8302,11 +8302,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -8332,10 +8332,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -8363,10 +8363,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -8402,10 +8402,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -8426,11 +8426,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -8456,10 +8456,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -8481,11 +8481,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -8505,10 +8505,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -8529,10 +8529,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -8553,11 +8553,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8577,10 +8577,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -8601,10 +8601,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -8626,11 +8626,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -8656,10 +8656,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -8682,10 +8682,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -8706,10 +8706,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -8745,10 +8745,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -8769,10 +8769,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -8793,11 +8793,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8817,10 +8817,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -8841,11 +8841,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8865,11 +8865,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -8889,10 +8889,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -8914,10 +8914,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -8944,10 +8944,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -8968,11 +8968,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -8998,10 +8998,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -9029,11 +9029,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -9058,11 +9058,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -9087,10 +9087,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -9116,10 +9116,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -9145,10 +9145,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -9174,10 +9174,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -9203,10 +9203,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -9232,10 +9232,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -9262,10 +9262,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -9297,10 +9297,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -9333,10 +9333,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -9385,10 +9385,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -9419,10 +9419,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -9453,10 +9453,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -9487,10 +9487,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -9521,10 +9521,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -9555,10 +9555,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -9589,10 +9589,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -9624,10 +9624,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -9664,10 +9664,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -9704,10 +9704,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -9745,10 +9745,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -9785,10 +9785,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -9824,10 +9824,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -9875,10 +9875,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -9916,10 +9916,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -9962,10 +9962,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -10003,10 +10003,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -10038,10 +10038,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -10072,10 +10072,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10106,10 +10106,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -10140,10 +10140,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10174,10 +10174,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -10208,10 +10208,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10243,10 +10243,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -10278,11 +10278,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -10314,10 +10314,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -10358,10 +10358,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -10404,10 +10404,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -10439,11 +10439,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -10473,10 +10473,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -10519,10 +10519,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -10555,10 +10555,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -10596,10 +10596,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -10632,10 +10632,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -10662,10 +10662,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -10691,10 +10691,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10720,10 +10720,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -10749,10 +10749,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10778,10 +10778,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -10807,10 +10807,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10837,11 +10837,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -10866,10 +10866,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -10901,24 +10901,82 @@ paths:
         description: "Id of aggregated-node-edge-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of aggregated-node-edge-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.NodeEdgePointRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
         in: "path"
-        description: "Id of aggregated-node-edge-point"
+        description: "Id of owned-node-edge-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -10937,16 +10995,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
-      summary: "returns tapi.common.BandwidthProfile"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10966,12 +11024,12 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -10997,10 +11055,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11026,15 +11084,16 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -11055,15 +11114,17 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
       parameters:
       - name: "uuid"
         in: "path"
@@ -11080,20 +11141,26 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -11110,15 +11177,20 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.CepList"
@@ -11143,10 +11215,10 @@ paths:
         200:
           description: "tapi.connectivity.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepList"
+            $ref: "#/definitions/tapi.connectivity.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11177,10 +11249,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11231,10 +11303,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11268,10 +11340,10 @@ paths:
         200:
           description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11302,10 +11374,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11351,10 +11423,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11392,10 +11464,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
   : get:
       tags:
       - "tapi-connectivity"
@@ -11426,82 +11498,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "service-interface-point-uuid"
-        in: "path"
-        description: "Id of mapped-service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -11528,10 +11528,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -11557,10 +11557,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11586,10 +11586,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11615,10 +11615,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11644,10 +11644,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11673,10 +11673,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11703,10 +11703,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11728,11 +11728,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -11752,10 +11752,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11776,10 +11776,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11800,11 +11800,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11824,10 +11824,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11848,10 +11848,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11873,144 +11873,108 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-connectivity:create-connectivity-service/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
-      responses:
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/delete-notification-subscription-service/:
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
       - "tapi-connectivity"
@@ -12033,7 +11997,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
       - "tapi-connectivity"
@@ -12056,7 +12020,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
       - "tapi-connectivity"
@@ -12079,7 +12043,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
       - "tapi-connectivity"
@@ -12093,76 +12057,76 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
       - "tapi-notification"
@@ -12185,7 +12149,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
       - "tapi-notification"
@@ -12203,12 +12167,26 @@ paths:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-notification:get-notification-subscription-service-list/:
+    post:
+      tags:
+      - "tapi-notification"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
       - "tapi-notification"
@@ -12217,183 +12195,205 @@ paths:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
       - "tapi-topology"
-      parameters: []
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-connectivity-service/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -12449,6 +12449,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -12492,6 +12496,14 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
@@ -12499,6 +12511,10 @@ definitions:
     - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
     - $ref: "#/definitions/tapi.path.computation.ContextAugmentation2"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation4"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -12580,6 +12596,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -12640,6 +12660,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -12693,6 +12721,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.getserviceinterfacepointdetails.Input:
     type: "object"
     properties:
@@ -12730,6 +12762,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
+  tapi.connectivity.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.CepList"
   tapi.connectivity.CepRole:
     type: "object"
     properties:
@@ -12739,6 +12775,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -12847,6 +12887,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+  tapi.connectivity.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -12854,6 +12902,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -12866,6 +12918,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -12931,6 +12991,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -13020,6 +13084,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+  tapi.connectivity.ConnectivityServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -13027,6 +13099,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+  tapi.connectivity.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityService"
   tapi.connectivity.ContextAugmentation3:
     type: "object"
     properties:
@@ -13165,6 +13245,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -13197,6 +13281,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -13302,6 +13394,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -13443,6 +13547,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -13494,6 +13602,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -13566,6 +13678,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -13579,6 +13695,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -13609,6 +13729,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -13617,6 +13741,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -13705,6 +13833,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -13737,6 +13869,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -13911,6 +14047,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -13939,6 +14079,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -13960,6 +14104,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -13969,6 +14117,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -13976,6 +14128,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -14012,6 +14168,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -14064,6 +14228,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -14116,6 +14284,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -14127,6 +14299,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -14196,6 +14372,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation4:
     type: "object"
     properties:
@@ -14219,6 +14399,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -14275,6 +14459,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -14301,6 +14489,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -14355,6 +14547,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -14366,6 +14566,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -14455,6 +14659,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -14510,6 +14718,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -14532,6 +14748,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -14552,6 +14772,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -14577,6 +14801,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -14691,6 +14919,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -14710,6 +14942,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -14747,6 +14983,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -14754,6 +14994,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -14819,6 +15067,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -14900,6 +15152,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation1"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -14934,3 +15190,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
diff --git a/OAS/tapi-dsr@2020-04-23.yaml b/OAS/tapi-dsr@2020-04-23.yaml
index c2062fff..ed756b3f 100644
--- a/OAS/tapi-dsr@2020-04-23.yaml
+++ b/OAS/tapi-dsr@2020-04-23.yaml
@@ -1,24 +1,24 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Connectivity Model definitions.\r\
-    \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI OAM Model definitions.\r\
+    \ the Apache License 2.0,\r\n        This module contains TAPI OAM Model definitions.\r\
     \n        Source: TapiOam.uml\r\n        - The TAPI YANG models included in this\
     \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
     \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
@@ -35,41 +35,41 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
-    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -120,8 +120,8 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0"
-  version: "2.2.0"
-  title: "tapi-connectivity,tapi-oam,tapi-topology,tapi-notification,tapi-common,tapi-path-computation,tapi-dsr\
+  version: "2.1.3"
+  title: "tapi-notification,tapi-oam,tapi-connectivity,tapi-topology,tapi-common,tapi-path-computation,tapi-dsr\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -129,7 +129,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -140,7 +140,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -154,7 +154,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -173,7 +173,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -192,32 +192,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -225,18 +214,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -246,183 +263,708 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityContext"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Connection"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of lower-connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Route"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
@@ -454,10 +996,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -485,10 +1027,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
     get:
       tags:
       - "tapi-connectivity"
@@ -509,11 +1051,11 @@ paths:
         200:
           description: "tapi.connectivity.ResilienceRoute"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -540,11 +1082,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LinkRef"
@@ -569,10 +1111,10 @@ paths:
         200:
           description: "tapi.topology.LinkRef"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -593,11 +1135,11 @@ paths:
         200:
           description: "tapi.connectivity.SwitchControl"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -624,11 +1166,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.ResilienceType"
@@ -648,10 +1190,10 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -682,11 +1224,11 @@ paths:
         200:
           description: "tapi.connectivity.SwitchControlRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.Switch"
@@ -711,11 +1253,11 @@ paths:
         200:
           description: "tapi.connectivity.Switch"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -747,10 +1289,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -796,10 +1338,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -835,10 +1377,10 @@ paths:
         200:
           description: "tapi.connectivity.RouteRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
     post:
       tags:
       - "tapi-connectivity"
@@ -850,7 +1392,7 @@ paths:
         description: "tapi.connectivity.ConnectivityService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -858,7 +1400,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -874,7 +1416,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityService"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -893,7 +1435,7 @@ paths:
         description: "tapi.connectivity.ConnectivityService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -917,7 +1459,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -938,10 +1480,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
     get:
       tags:
       - "tapi-connectivity"
@@ -957,7 +1499,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -976,7 +1518,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1000,7 +1542,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1024,7 +1566,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1042,7 +1584,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1050,7 +1592,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1072,7 +1614,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -1097,7 +1639,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1127,7 +1669,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1144,7 +1686,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1152,8 +1694,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceRef"
@@ -1173,7 +1715,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -1197,7 +1739,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1226,7 +1768,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1244,7 +1786,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1252,7 +1794,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1273,7 +1815,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -1298,7 +1840,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1327,7 +1869,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1348,7 +1890,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -1372,7 +1914,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1401,7 +1943,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1430,8 +1972,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -1451,7 +1993,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -1475,7 +2017,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1504,7 +2046,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1533,7 +2075,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1554,7 +2096,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1578,7 +2120,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1607,7 +2149,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1636,7 +2178,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1657,7 +2199,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1681,7 +2223,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1710,7 +2252,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1739,8 +2281,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1760,7 +2302,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1784,7 +2326,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1813,7 +2355,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1842,7 +2384,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1863,7 +2405,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1887,7 +2429,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1916,7 +2458,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1945,8 +2487,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1967,7 +2509,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1992,7 +2534,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2022,7 +2564,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2052,7 +2594,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -2093,10 +2635,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2120,7 +2662,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2128,8 +2670,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -2156,7 +2698,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2187,7 +2729,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2223,8 +2765,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2244,7 +2786,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2269,7 +2811,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2299,7 +2841,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2328,8 +2870,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2349,7 +2891,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2374,7 +2916,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2404,7 +2946,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2433,8 +2975,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2454,7 +2996,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2479,7 +3021,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2509,7 +3051,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2538,8 +3080,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -2559,7 +3101,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2583,7 +3125,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2612,7 +3154,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2641,7 +3183,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2659,7 +3201,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2667,8 +3209,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -2689,7 +3231,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -2714,7 +3256,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2744,7 +3286,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2760,7 +3302,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2779,7 +3321,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2803,7 +3345,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2827,7 +3369,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2843,7 +3385,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2862,7 +3404,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2886,7 +3428,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2910,7 +3452,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2926,7 +3468,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2945,7 +3487,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2969,7 +3511,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2993,7 +3535,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3012,7 +3554,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3020,7 +3562,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3043,7 +3585,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -3069,7 +3611,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3100,7 +3642,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3116,7 +3658,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3135,7 +3677,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3159,7 +3701,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3183,8 +3725,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -3199,7 +3741,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -3218,7 +3760,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3242,7 +3784,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3266,8 +3808,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3282,7 +3824,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3301,7 +3843,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3325,7 +3867,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3349,8 +3891,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3365,7 +3907,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3384,7 +3926,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3408,7 +3950,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3432,8 +3974,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3448,7 +3990,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3467,7 +4009,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3491,7 +4033,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3515,8 +4057,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3531,7 +4073,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3550,7 +4092,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3574,7 +4116,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3598,7 +4140,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3615,7 +4157,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3635,7 +4177,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3660,7 +4202,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3685,7 +4227,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3701,7 +4243,7 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
     post:
@@ -3720,7 +4262,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3744,7 +4286,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3768,7 +4310,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3785,7 +4327,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3793,8 +4335,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -3814,7 +4356,7 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -3838,7 +4380,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3867,7 +4409,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3883,7 +4425,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -3902,7 +4444,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3926,7 +4468,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3950,94 +4492,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/name={value-name}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
@@ -4048,7 +4503,7 @@ paths:
         200:
           description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4062,7 +4517,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4081,7 +4536,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4100,7 +4555,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
@@ -4113,7 +4568,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4121,7 +4576,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4137,7 +4592,7 @@ paths:
         200:
           description: "tapi.notification.NotificationSubscriptionService"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -4157,7 +4612,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4181,7 +4636,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4200,7 +4655,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4208,7 +4663,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4231,7 +4686,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4257,7 +4712,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4288,7 +4743,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
@@ -4304,11 +4759,11 @@ paths:
         200:
           description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4330,10 +4785,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4354,11 +4809,11 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4383,11 +4838,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.AlarmInfo"
@@ -4407,11 +4862,11 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.NameAndValueChange"
@@ -4436,11 +4891,11 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4467,11 +4922,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4496,11 +4951,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.TcaInfo"
@@ -4520,10 +4975,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
       - "tapi-notification"
@@ -4539,7 +4994,7 @@ paths:
         200:
           description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
@@ -4558,7 +5013,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4582,7 +5037,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4606,7 +5061,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4625,7 +5080,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4633,8 +5088,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4656,7 +5111,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4682,7 +5137,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4713,7 +5168,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4729,10 +5184,10 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4753,10 +5208,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
       - "tapi-notification"
@@ -4772,10 +5227,10 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4796,10 +5251,10 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4822,10 +5277,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4846,10 +5301,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
       - "tapi-notification"
@@ -4865,10 +5320,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/:
+  /data/tapi-common:context/tapi-oam:oam-context/:
     get:
       tags:
       - "tapi-oam"
@@ -4879,7 +5334,7 @@ paths:
         200:
           description: "tapi.oam.OamContext"
           schema:
-            $ref: "#/definitions/tapi.oam.OamContext"
+            $ref: "#/definitions/tapi.oam.OamContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4893,7 +5348,7 @@ paths:
         description: "tapi.oam.OamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4912,7 +5367,7 @@ paths:
         description: "tapi.oam.OamContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4931,7 +5386,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/meg={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -4947,10 +5402,10 @@ paths:
         200:
           description: "tapi.oam.Meg"
           schema:
-            $ref: "#/definitions/tapi.oam.Meg"
+            $ref: "#/definitions/tapi.oam.MegWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -4974,10 +5429,10 @@ paths:
         200:
           description: "tapi.oam.Mep"
           schema:
-            $ref: "#/definitions/tapi.oam.Mep"
+            $ref: "#/definitions/tapi.oam.MepWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5005,10 +5460,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -5029,10 +5484,10 @@ paths:
         200:
           description: "tapi.oam.Mip"
           schema:
-            $ref: "#/definitions/tapi.oam.Mip"
+            $ref: "#/definitions/tapi.oam.MipWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5060,10 +5515,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5086,10 +5541,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -5101,7 +5556,7 @@ paths:
         description: "tapi.oam.OamJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5109,7 +5564,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5125,7 +5580,7 @@ paths:
         200:
           description: "tapi.oam.OamJob"
           schema:
-            $ref: "#/definitions/tapi.oam.OamJob"
+            $ref: "#/definitions/tapi.oam.OamJobWrapper"
         400:
           description: "Internal error"
     put:
@@ -5144,7 +5599,7 @@ paths:
         description: "tapi.oam.OamJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5168,7 +5623,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -5187,7 +5642,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5195,7 +5650,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5218,7 +5673,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5244,7 +5699,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5275,7 +5730,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -5291,7 +5746,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -5310,7 +5765,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5334,7 +5789,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5358,7 +5813,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -5375,7 +5830,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5383,8 +5838,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.OamServiceEndPointRef"
@@ -5409,7 +5864,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -5438,7 +5893,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5472,7 +5927,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -5497,10 +5952,10 @@ paths:
         200:
           description: "tapi.oam.PmCurrentData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmCurrentData"
+            $ref: "#/definitions/tapi.oam.PmCurrentDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
     get:
       tags:
       - "tapi-oam"
@@ -5521,10 +5976,10 @@ paths:
         200:
           description: "tapi.common.TimeInterval"
           schema:
-            $ref: "#/definitions/tapi.common.TimeInterval"
+            $ref: "#/definitions/tapi.common.TimeIntervalWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
     get:
       tags:
       - "tapi-oam"
@@ -5550,10 +6005,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -5574,10 +6029,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5605,11 +6060,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.PmHistoryData"
@@ -5637,10 +6092,10 @@ paths:
         200:
           description: "tapi.oam.PmHistoryData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmHistoryData"
+            $ref: "#/definitions/tapi.oam.PmHistoryDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
   : get:
       tags:
       - "tapi-oam"
@@ -5666,10 +6121,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-oam"
@@ -5702,10 +6157,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/schedule/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/schedule/:
     get:
       tags:
       - "tapi-oam"
@@ -5721,7 +6176,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -5740,7 +6195,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -5764,7 +6219,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -5788,7 +6243,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile/:
     post:
       tags:
       - "tapi-oam"
@@ -5800,7 +6255,7 @@ paths:
         description: "tapi.oam.OamProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -5808,7 +6263,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5824,7 +6279,7 @@ paths:
         200:
           description: "tapi.oam.OamProfile"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfile"
+            $ref: "#/definitions/tapi.oam.OamProfileWrapper"
         400:
           description: "Internal error"
     put:
@@ -5843,7 +6298,7 @@ paths:
         description: "tapi.oam.OamProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -5867,7 +6322,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -5886,7 +6341,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5894,7 +6349,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5917,7 +6372,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5943,7 +6398,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5974,7 +6429,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data/:
     post:
       tags:
       - "tapi-oam"
@@ -5991,7 +6446,7 @@ paths:
         description: "tapi.oam.PmBinData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -5999,7 +6454,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6020,7 +6475,7 @@ paths:
         200:
           description: "tapi.oam.PmBinData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmBinData"
+            $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -6044,7 +6499,7 @@ paths:
         description: "tapi.oam.PmBinData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6073,7 +6528,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -6094,7 +6549,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -6118,7 +6573,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6147,7 +6602,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6176,7 +6631,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6200,7 +6655,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6208,7 +6663,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6236,7 +6691,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6267,7 +6722,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6303,7 +6758,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data/:
     post:
       tags:
       - "tapi-oam"
@@ -6320,7 +6775,7 @@ paths:
         description: "tapi.oam.PmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6328,7 +6783,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6349,7 +6804,7 @@ paths:
         200:
           description: "tapi.oam.PmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmThresholdData"
+            $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -6373,7 +6828,7 @@ paths:
         description: "tapi.oam.PmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6402,7 +6857,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -6423,7 +6878,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -6447,7 +6902,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6476,7 +6931,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6505,7 +6960,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6529,7 +6984,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6537,7 +6992,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6565,7 +7020,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6596,7 +7051,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6632,7 +7087,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -6644,7 +7099,7 @@ paths:
         description: "tapi.oam.OamService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -6652,7 +7107,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -6668,7 +7123,7 @@ paths:
         200:
           description: "tapi.oam.OamService"
           schema:
-            $ref: "#/definitions/tapi.oam.OamService"
+            $ref: "#/definitions/tapi.oam.OamServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -6687,7 +7142,7 @@ paths:
         description: "tapi.oam.OamService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -6711,7 +7166,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -6728,7 +7183,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -6736,7 +7191,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6757,7 +7212,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -6781,7 +7236,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -6810,7 +7265,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
     get:
       tags:
       - "tapi-oam"
@@ -6831,7 +7286,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -6856,7 +7311,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6886,7 +7341,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6915,7 +7370,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mep/:
     get:
       tags:
       - "tapi-oam"
@@ -6936,10 +7391,10 @@ paths:
         200:
           description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mip/:
     get:
       tags:
       - "tapi-oam"
@@ -6960,10 +7415,10 @@ paths:
         200:
           description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6987,7 +7442,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6995,7 +7450,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7023,7 +7478,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7054,7 +7509,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7090,7 +7545,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
     get:
       tags:
       - "tapi-oam"
@@ -7111,7 +7566,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -7135,7 +7590,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7164,7 +7619,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7193,7 +7648,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/meg/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/meg/:
     get:
       tags:
       - "tapi-oam"
@@ -7209,10 +7664,10 @@ paths:
         200:
           description: "tapi.oam.MegRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MegRef"
+            $ref: "#/definitions/tapi.oam.MegRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -7231,7 +7686,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7239,7 +7694,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7262,7 +7717,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7288,7 +7743,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7319,7 +7774,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -7335,7 +7790,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -7354,7 +7809,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7378,7 +7833,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7402,7 +7857,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
     get:
       tags:
       - "tapi-path-computation"
@@ -7413,7 +7868,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationContext"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -7428,7 +7883,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -7448,7 +7903,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -7467,7 +7922,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
     post:
       tags:
       - "tapi-path-computation"
@@ -7480,7 +7935,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -7488,7 +7943,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -7504,7 +7959,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationService"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -7524,7 +7979,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -7548,7 +8003,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-path-computation"
@@ -7565,7 +8020,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -7573,7 +8028,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -7594,7 +8049,7 @@ paths:
         200:
           description: "tapi.path.computation.PathServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -7618,7 +8073,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -7647,8 +8102,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.Capacity"
@@ -7668,7 +8123,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -7692,7 +8147,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -7721,7 +8176,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -7750,8 +8205,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.BandwidthProfile"
@@ -7771,7 +8226,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -7795,7 +8250,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -7824,7 +8279,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -7853,7 +8308,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -7874,7 +8329,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -7898,7 +8353,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7927,7 +8382,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7956,7 +8411,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -7977,7 +8432,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8001,7 +8456,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8030,7 +8485,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8059,7 +8514,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8080,7 +8535,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8104,7 +8559,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8133,7 +8588,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8162,7 +8617,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8183,7 +8638,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8207,7 +8662,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8236,7 +8691,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8265,8 +8720,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
@@ -8287,247 +8742,15 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8540,11 +8763,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8555,8 +8778,9 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8569,11 +8793,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8584,8 +8808,9 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8602,7 +8827,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8616,12 +8841,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.common.NameAndValue.body-param"
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8629,8 +8859,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -8643,6 +8873,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -8652,7 +8887,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -8668,6 +8903,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -8678,7 +8918,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8699,6 +8939,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -8709,11 +8954,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8721,17 +8966,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathObjectiveFunction"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8739,12 +8989,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -8755,7 +9010,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8763,12 +9018,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -8779,7 +9039,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8787,12 +9047,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8811,7 +9076,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8819,7 +9084,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -8842,7 +9107,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -8868,7 +9133,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8899,11 +9164,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8913,15 +9178,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8930,12 +9195,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ to list"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -8946,7 +9210,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8955,12 +9219,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -8971,7 +9234,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8984,7 +9247,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -9003,7 +9266,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9011,8 +9274,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -9034,7 +9297,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -9060,7 +9323,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9091,187 +9354,68 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.topology.CostCharacteristic"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
-    put:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - in: "body"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9282,32 +9426,27 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9315,11 +9454,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9327,54 +9466,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9385,18 +9526,19 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -9404,11 +9546,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9416,17 +9558,41 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9435,11 +9601,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9450,7 +9616,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9459,11 +9625,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9474,7 +9640,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9487,30 +9653,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9518,11 +9667,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9530,106 +9679,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-    post:
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9639,26 +9736,33 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9666,11 +9770,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9678,52 +9782,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.RiskCharacteristic"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9734,17 +9840,18 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
@@ -9752,11 +9859,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9766,15 +9873,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.TopologyConstraint"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9783,11 +9890,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9798,7 +9905,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9807,11 +9914,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9822,7 +9929,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9835,151 +9942,91 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.Path"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.path.computation.ValueOrPriority"
@@ -9987,91 +10034,98 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
         400:
           description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10079,42 +10133,52 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePoint"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10124,13 +10188,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
@@ -10138,171 +10207,141 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
+      - name: "link-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -10310,7 +10349,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       - name: "value-name"
@@ -10322,199 +10361,160 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -10525,7 +10525,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -10539,7 +10539,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -10558,7 +10558,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -10577,7 +10577,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -10588,10 +10588,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -10609,10 +10609,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -10628,10 +10628,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -10647,10 +10647,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -10671,10 +10671,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -10695,10 +10695,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -10719,11 +10719,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -10743,10 +10743,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -10767,11 +10767,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -10791,11 +10791,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -10815,10 +10815,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -10840,10 +10840,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -10870,11 +10870,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -10900,10 +10900,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -10931,10 +10931,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -10970,10 +10970,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -10994,11 +10994,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -11024,10 +11024,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11049,11 +11049,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -11073,10 +11073,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11097,10 +11097,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11121,11 +11121,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11145,10 +11145,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11169,10 +11169,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11194,11 +11194,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -11224,10 +11224,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11250,10 +11250,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -11274,10 +11274,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11313,10 +11313,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11337,10 +11337,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -11361,11 +11361,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11385,10 +11385,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11409,11 +11409,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11433,11 +11433,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11457,10 +11457,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11482,10 +11482,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11512,10 +11512,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -11536,11 +11536,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -11566,10 +11566,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11597,11 +11597,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -11626,11 +11626,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -11655,10 +11655,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -11684,10 +11684,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11713,10 +11713,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11742,10 +11742,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11771,10 +11771,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11800,10 +11800,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11830,10 +11830,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -11865,10 +11865,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11901,10 +11901,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11953,10 +11953,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -11987,10 +11987,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -12021,10 +12021,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12055,10 +12055,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12089,10 +12089,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12123,10 +12123,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12157,10 +12157,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12192,10 +12192,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12232,10 +12232,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12272,10 +12272,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12313,10 +12313,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12353,10 +12353,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -12392,10 +12392,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -12443,10 +12443,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -12484,10 +12484,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12530,10 +12530,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -12571,10 +12571,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -12606,10 +12606,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -12640,10 +12640,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12674,10 +12674,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12708,10 +12708,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12742,10 +12742,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12776,10 +12776,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12811,10 +12811,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12846,11 +12846,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -12882,10 +12882,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12926,10 +12926,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12972,10 +12972,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13007,11 +13007,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -13041,10 +13041,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -13087,10 +13087,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -13123,10 +13123,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13164,10 +13164,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -13200,10 +13200,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -13230,10 +13230,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -13259,10 +13259,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13288,10 +13288,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13317,10 +13317,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13346,10 +13346,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13375,10 +13375,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13405,11 +13405,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -13434,10 +13434,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -13478,10 +13478,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -13507,10 +13507,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -13536,10 +13536,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13565,10 +13565,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13594,10 +13594,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13623,10 +13623,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13652,10 +13652,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13682,15 +13682,17 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
-      description: "none"
+      - "tapi-topology"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13707,19 +13709,26 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ceplist.ConnectionEndPoint"
-      description: "none"
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13736,23 +13745,23 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ceplist.ConnectionEndPoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13770,47 +13779,19 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "aggregated-connection-end-point-node-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "aggregated-connection-end-point-connection-end-point-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.CepRole"
-      description: "Defines the role of the CEP in the context of the connection spec.\r\
-        \n                There may be many cep role - connection spec combinations\
-        \ for a particular CEP where each corresponds to a specific connection associated\
-        \ with the CEP."
+      summary: "returns tapi.connectivity.ceplist.ConnectionEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13834,17 +13815,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.CepRole"
+          description: "tapi.connectivity.ceplist.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "The reference to the spec that defines the cep role."
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13866,68 +13847,76 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "aggregated-connection-end-point-node-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "aggregated-connection-end-point-connection-end-point-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
-      description: "none"
+      summary: "returns tapi.connectivity.CepRole"
+      description: "Defines the role of the CEP in the context of the connection spec.\r\
+        \n                There may be many cep role - connection spec combinations\
+        \ for a particular CEP where each corresponds to a specific connection associated\
+        \ with the CEP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of topology"
         required: true
         type: "string"
-      - name: "topology-uuid"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of node"
         required: true
         type: "string"
-      - name: "client-node-edge-point-node-uuid"
+      - name: "owned-node-edge-point-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepMipList"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "The reference to the spec that defines the cep role."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13951,16 +13940,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepMipList"
+          description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.oam.MepMipList"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mep={meg-uuid},{mep-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13983,29 +13972,36 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of client-node-edge-point"
         required: true
         type: "string"
-      - name: "mep-local-id"
+      - name: "client-node-edge-point-node-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mip={meg-uuid},{mip-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -14027,31 +14023,24 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      - name: "mip-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mip"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MipRef"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.topology.NodeEdgePointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14073,23 +14062,18 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepMipList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14114,19 +14098,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.oam.MepMipList"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.oam.MepMipListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mep={meg-uuid},{mep-local-id}/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14143,26 +14125,34 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "service-interface-point-uuid"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of mapped-service-interface-point"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      - name: "mep-local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mip={meg-uuid},{mip-local-id}/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14179,19 +14169,29 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      - name: "mip-local-id"
+        in: "path"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -14218,10 +14218,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -14247,10 +14247,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14276,10 +14276,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14305,10 +14305,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14334,10 +14334,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14363,10 +14363,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14393,10 +14393,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -14418,11 +14418,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -14442,10 +14442,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14466,10 +14466,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14490,11 +14490,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -14514,10 +14514,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14538,10 +14538,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -14563,505 +14563,506 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-job/:
+  /operations/tapi-connectivity:create-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamJob"
-      description: "operates on tapi.oam.CreateOamJob"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamjob.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamjob.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamJob"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service-end-point/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
-      description: "operates on tapi.oam.CreateOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamService"
-      description: "operates on tapi.oam.CreateOamService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectionDetails"
+      description: "operates on tapi.connectivity.GetConnectionDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamservice.Input.body-param"
+        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
+      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
+        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-job/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamJob"
-      description: "operates on tapi.oam.DeleteOamJob"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.deleteoamjob.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
+      - "tapi-connectivity"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service-end-point/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
-      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamService"
-      description: "operates on tapi.oam.DeleteOamService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamservice.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionDetails"
-      description: "operates on tapi.connectivity.GetConnectionDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
-      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
+      - "tapi-notification"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-connectivity"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-meg/:
+  /operations/tapi-oam:create-oam-job/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetMeg"
-      description: "operates on tapi.oam.GetMeg"
+      summary: "operates on tapi.oam.CreateOamJob"
+      description: "operates on tapi.oam.CreateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.oam.getmeg.Input.body-param"
+        name: "tapi.oam.createoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getmeg.Input"
+              $ref: "#/definitions/tapi.oam.createoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetMeg"
+            $ref: "#/definitions/tapi.oam.CreateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-oam:create-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
+      description: "operates on tapi.oam.CreateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-oam:create-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamService"
+      description: "operates on tapi.oam.CreateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.oam.createoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-oam:delete-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamJob"
+      description: "operates on tapi.oam.DeleteOamJob"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
+        name: "tapi.oam.deleteoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-oam:delete-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-oam:delete-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamService"
+      description: "operates on tapi.oam.DeleteOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.deleteoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-oam:get-meg/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetMeg"
+      description: "operates on tapi.oam.GetMeg"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.getmeg.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.getmeg.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.oam.GetMeg"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-job/:
+  /operations/tapi-oam:get-oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -15084,7 +15085,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-end-point/:
+  /operations/tapi-oam:get-oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -15107,7 +15108,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-list/:
+  /operations/tapi-oam:get-oam-service-list/:
     post:
       tags:
       - "tapi-oam"
@@ -15121,7 +15122,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service/:
+  /operations/tapi-oam:get-oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -15144,247 +15145,246 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-oam:update-oam-job/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamJob"
+      description: "operates on tapi.oam.UpdateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.oam.updateoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/get-service-interface-point-list/:
-    post:
-      tags:
-      - "tapi-common"
-      parameters: []
+              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.oam.UpdateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-oam:update-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-oam:update-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamService"
+      description: "operates on tapi.oam.UpdateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.oam.updateoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.oam.UpdateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-topology"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-connectivity-service/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-job/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamJob"
-      description: "operates on tapi.oam.UpdateOamJob"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamjob.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamJob"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service-end-point/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
-      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamService"
-      description: "operates on tapi.oam.UpdateOamService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamservice.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamService"
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -15440,6 +15440,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -15483,14 +15487,26 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.connectivity.ContextAugmentation4"
-    - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
-    - $ref: "#/definitions/tapi.oam.ContextAugmentation2"
+    - $ref: "#/definitions/tapi.notification.ContextAugmentation2"
+    - $ref: "#/definitions/tapi.oam.ContextAugmentation1"
     - $ref: "#/definitions/tapi.path.computation.ContextAugmentation3"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation5"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -15572,6 +15588,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -15632,6 +15652,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -15684,6 +15712,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.common.TimePeriod"
+  tapi.common.TimeIntervalWrapper:
+    properties:
+      elapsed-time:
+        $ref: "#/definitions/tapi.common.TimeInterval"
   tapi.common.TimePeriod:
     type: "object"
     properties:
@@ -15694,6 +15726,10 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.TimeUnit"
+  tapi.common.TimePeriodWrapper:
+    properties:
+      period:
+        $ref: "#/definitions/tapi.common.TimePeriod"
   tapi.common.TimeRange:
     type: "object"
     properties:
@@ -15703,6 +15739,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.TimeUnit:
     type: "string"
     enum:
@@ -15754,6 +15794,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -15862,6 +15906,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -15869,6 +15917,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -15881,6 +15933,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -15946,6 +16006,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -16035,6 +16099,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+  tapi.connectivity.ConnectivityServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -16042,6 +16114,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+  tapi.connectivity.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityService"
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
@@ -16180,6 +16260,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -16212,6 +16296,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -16317,6 +16409,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -16326,6 +16430,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
     - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation1"
+  tapi.connectivity.ceplist.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -16336,6 +16444,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
       description: "none"
+  tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
   tapi.connectivity.createconnectivityservice.Input:
     type: "object"
     properties:
@@ -16472,7 +16584,11 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
-  tapi.notification.ContextAugmentation1:
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
+  tapi.notification.ContextAugmentation2:
     type: "object"
     properties:
       notification-context:
@@ -16523,6 +16639,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -16595,6 +16715,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -16608,6 +16732,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -16638,6 +16766,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -16646,6 +16778,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -16734,6 +16870,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -16766,6 +16906,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -16881,7 +17025,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-oam"
       namespace: "urn:onf:otcc:yang:tapi-oam"
-  tapi.oam.ContextAugmentation2:
+  tapi.oam.ContextAugmentation1:
     type: "object"
     properties:
       oam-context:
@@ -16970,6 +17114,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid"
+  tapi.oam.MegRefWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.MegRef"
+  tapi.oam.MegWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.Meg"
   tapi.oam.Mep:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17004,6 +17156,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepMipListWrapper:
+    properties:
+      tapi-oam:mep-mip-list:
+        $ref: "#/definitions/tapi.oam.MepMipList"
   tapi.oam.MepRef:
     allOf:
     - $ref: "#/definitions/tapi.oam.MegRef"
@@ -17014,6 +17170,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MepRefWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.Mep"
   tapi.oam.Mip:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17033,6 +17197,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MipRefWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.MipRef"
+  tapi.oam.MipWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.Mip"
   tapi.oam.OamConstraint:
     type: "object"
     properties:
@@ -17069,6 +17241,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.Meg"
+  tapi.oam.OamContextWrapper:
+    properties:
+      tapi-oam:oam-context:
+        $ref: "#/definitions/tapi.oam.OamContext"
   tapi.oam.OamJob:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -17102,6 +17278,10 @@ definitions:
           type: "string"
           description: "none"
       description: "none"
+  tapi.oam.OamJobWrapper:
+    properties:
+      oam-job:
+        $ref: "#/definitions/tapi.oam.OamJob"
   tapi.oam.OamProfile:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -17125,6 +17305,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid"
+  tapi.oam.OamProfileRefWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfileRef"
+  tapi.oam.OamProfileWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfile"
   tapi.oam.OamService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -17193,6 +17381,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id"
       description: "none"
+  tapi.oam.OamServiceEndPointRefWrapper:
+    properties:
+      oam-service-end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+  tapi.oam.OamServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
   tapi.oam.OamServiceRef:
     type: "object"
     properties:
@@ -17200,6 +17396,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid"
+  tapi.oam.OamServiceWrapper:
+    properties:
+      oam-service:
+        $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.PmBinData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17209,6 +17409,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmBinDataWrapper:
+    properties:
+      pm-bin-data:
+        $ref: "#/definitions/tapi.oam.PmBinData"
   tapi.oam.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17248,6 +17452,10 @@ definitions:
             \ hour in case of a 15 minute interval and bound to the hour in case of\
             \ a 24 hour interval."
       description: "none"
+  tapi.oam.PmCurrentDataWrapper:
+    properties:
+      pm-current-data:
+        $ref: "#/definitions/tapi.oam.PmCurrentData"
   tapi.oam.PmHistoryData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17265,6 +17473,10 @@ definitions:
             \ be reliable."
           default: false
       description: "none"
+  tapi.oam.PmHistoryDataWrapper:
+    properties:
+      pm-history-data:
+        $ref: "#/definitions/tapi.oam.PmHistoryData"
   tapi.oam.PmThresholdData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17278,6 +17490,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmThresholdDataWrapper:
+    properties:
+      pm-threshold-data:
+        $ref: "#/definitions/tapi.oam.PmThresholdData"
   tapi.oam.UpdateOamJob:
     type: "object"
     properties:
@@ -17584,6 +17800,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -17612,6 +17832,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17633,6 +17857,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17642,6 +17870,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -17649,6 +17881,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17685,6 +17921,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -17737,6 +17981,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -17789,6 +18037,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -17800,6 +18052,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -17869,6 +18125,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
@@ -17892,6 +18152,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -17948,6 +18212,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -17974,6 +18242,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -18028,6 +18300,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -18039,6 +18319,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -18128,6 +18412,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -18183,6 +18471,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -18205,6 +18501,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -18225,6 +18525,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -18250,6 +18554,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -18364,6 +18672,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -18383,6 +18695,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -18420,6 +18736,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -18427,6 +18747,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -18492,6 +18820,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -18573,6 +18905,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation1"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -18607,3 +18943,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
diff --git a/OAS/tapi-equipment@2020-04-23.yaml b/OAS/tapi-equipment@2020-04-23.yaml
index b2518a10..a0aa77bc 100644
--- a/OAS/tapi-equipment@2020-04-23.yaml
+++ b/OAS/tapi-equipment@2020-04-23.yaml
@@ -1,41 +1,41 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Topology Model definitions.\r\
-    \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -68,15 +68,15 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
-  title: "tapi-topology,tapi-notification,tapi-common,tapi-equipment API"
+  version: "2.1.3"
+  title: "tapi-notification,tapi-topology,tapi-common,tapi-equipment API"
 host: "localhost:1234"
 consumes:
 - "application/yang-data+json"
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -87,7 +87,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -101,7 +101,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -120,7 +120,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -139,7 +139,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/name/:
     post:
       tags:
       - "tapi-common"
@@ -153,7 +153,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -161,7 +161,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -179,7 +179,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -200,7 +200,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -226,32 +226,19 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.notification.NotificationContext"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -259,18 +246,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePoint"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -280,100 +291,158 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationSubscriptionService"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
     post:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -381,7 +450,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
@@ -389,7 +458,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -397,10 +466,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -408,7 +477,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -420,12 +489,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -433,7 +502,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -446,7 +515,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -456,7 +525,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -464,7 +533,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -477,277 +546,167 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.Notification"
-          schema:
-            $ref: "#/definitions/tapi.notification.Notification"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.NameAndValueChange"
-          schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.TcaInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
+  /data/tapi-common:context/tapi-equipment:physical-context/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PhysicalContext"
       description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
+      parameters: []
       responses:
         200:
-          description: "tapi.notification.SubscriptionFilter"
+          description: "tapi.equipment.PhysicalContext"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.equipment.PhysicalContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      - "tapi-equipment"
+      summary: "creates tapi.equipment.PhysicalContext"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.equipment.PhysicalContext.body-param"
+        description: "tapi.equipment.PhysicalContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.equipment.PhysicalContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -757,21 +716,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      - "tapi-equipment"
+      summary: "creates or updates tapi.equipment.PhysicalContext"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.equipment.PhysicalContext.body-param"
+        description: "tapi.equipment.PhysicalContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.equipment.PhysicalContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -781,217 +735,143 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      - "tapi-equipment"
+      summary: "removes tapi.equipment.PhysicalContext"
       description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
-    post:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.Device"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of device"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.equipment.Device"
+          schema:
+            $ref: "#/definitions/tapi.equipment.DeviceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AccessPort"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of access-port"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.equipment.AccessPort"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.equipment.AccessPortWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ConnectorPinAddress"
+      description: "The list of Pins that support the AccessPort."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of access-port"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
+      - name: "connector-identification"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "pin-identification"
         in: "path"
-        description: "Id of name"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.equipment.ConnectorPinAddress"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.equipment.ConnectorPinAddressWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PinAndRole"
+      description: "If there is more than one pin used in a connector and/or there\
+        \ is a need to identify the role of one or more pins then this property can\
+        \ be used.\r\n                For simple cases pinIdentification can be used\
+        \ instead."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of additional-info"
+        description: "Id of access-port"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "connector-identification"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.notification.AlarmInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "pin-identification"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.equipment.PinAndRole"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.equipment.PinAndRoleWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-notification"
+      - "tapi-equipment"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -999,7 +879,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "access-port-uuid"
+        in: "path"
+        description: "Id of access-port"
         required: true
         type: "string"
       - name: "value-name"
@@ -1011,120 +896,134 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.Equipment"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of target-object-name"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.equipment.Equipment"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.equipment.EquipmentWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ActualEquipment"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.TcaInfo"
+          description: "tapi.equipment.ActualEquipment"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.equipment.ActualEquipmentWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.PhysicalContext"
+      summary: "returns tapi.equipment.ActualNonFieldReplaceableModule"
       description: "none"
-      parameters: []
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.equipment.PhysicalContext"
+          description: "tapi.equipment.ActualNonFieldReplaceableModule"
           schema:
-            $ref: "#/definitions/tapi.equipment.PhysicalContext"
+            $ref: "#/definitions/tapi.equipment.ActualNonFieldReplaceableModuleWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-actual-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "creates tapi.equipment.PhysicalContext"
+      summary: "returns tapi.equipment.CommonActualProperties"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.equipment.PhysicalContext.body-param"
-        description: "tapi.equipment.PhysicalContext to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.equipment.PhysicalContext"
+      - name: "uuid"
+        in: "path"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.equipment.CommonActualProperties"
+          schema:
+            $ref: "#/definitions/tapi.equipment.CommonActualPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-equipment-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "creates or updates tapi.equipment.PhysicalContext"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.equipment.PhysicalContext.body-param"
-        description: "tapi.equipment.PhysicalContext to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.equipment.PhysicalContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-equipment"
-      summary: "removes tapi.equipment.PhysicalContext"
-      description: "none"
-      parameters: []
+      - name: "uuid"
+        in: "path"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.equipment.CommonEquipmentProperties"
+          schema:
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/physical-context/device={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-actual-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.Device"
+      summary: "returns tapi.equipment.CommonActualProperties"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1132,18 +1031,23 @@ paths:
         description: "Id of device"
         required: true
         type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.equipment.Device"
+          description: "tapi.equipment.CommonActualProperties"
           schema:
-            $ref: "#/definitions/tapi.equipment.Device"
+            $ref: "#/definitions/tapi.equipment.CommonActualPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-equipment-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.AccessPort"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1151,135 +1055,113 @@ paths:
         description: "Id of device"
         required: true
         type: "string"
-      - name: "access-port-uuid"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of access-port"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.AccessPort"
+          description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.equipment.AccessPort"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ConnectorPinAddress"
-      description: "The list of Pins that support the AccessPort."
+      summary: "returns tapi.equipment.Holder"
+      description: "References the Holder in an Equipment that is available to take\
+        \ other Equipments.\r\n                For example:\r\n                - Slot\
+        \ in a sub-rack\r\n                - Slot in a Field Replaceable Unit that\
+        \ can take a small form-factor pluggable."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of device"
         required: true
         type: "string"
-      - name: "access-port-uuid"
-        in: "path"
-        description: "Id of access-port"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "pin-identification"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of equipment"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "contained-holder-uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.ConnectorPinAddress"
+          description: "tapi.equipment.Holder"
           schema:
-            $ref: "#/definitions/tapi.equipment.ConnectorPinAddress"
+            $ref: "#/definitions/tapi.equipment.HolderWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.PinAndRole"
-      description: "If there is more than one pin used in a connector and/or there\
-        \ is a need to identify the role of one or more pins then this property can\
-        \ be used.\r\n                For simple cases pinIdentification can be used\
-        \ instead."
+      summary: "returns tapi.equipment.ActualHolder"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of device"
         required: true
         type: "string"
-      - name: "access-port-uuid"
-        in: "path"
-        description: "Id of access-port"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "pin-identification"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of equipment"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "contained-holder-uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.PinAndRole"
+          description: "tapi.equipment.ActualHolder"
           schema:
-            $ref: "#/definitions/tapi.equipment.PinAndRole"
+            $ref: "#/definitions/tapi.equipment.ActualHolderWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/common-holder-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.equipment.CommonHolderProperties"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of device"
         required: true
         type: "string"
-      - name: "access-port-uuid"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of access-port"
+        description: "Id of equipment"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "contained-holder-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.equipment.CommonHolderProperties"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.equipment.CommonHolderPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.Equipment"
+      summary: "returns tapi.equipment.ExpectedHolder"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1292,18 +1174,23 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.equipment.Equipment"
+          description: "tapi.equipment.ExpectedHolder"
           schema:
-            $ref: "#/definitions/tapi.equipment.Equipment"
+            $ref: "#/definitions/tapi.equipment.ExpectedHolderWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/common-holder-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ActualEquipment"
+      summary: "returns tapi.equipment.CommonHolderProperties"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1316,19 +1203,26 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.equipment.ActualEquipment"
+          description: "tapi.equipment.CommonHolderProperties"
           schema:
-            $ref: "#/definitions/tapi.equipment.ActualEquipment"
+            $ref: "#/definitions/tapi.equipment.CommonHolderPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ActualNonFieldReplaceableModule"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -1340,43 +1234,31 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ActualNonFieldReplaceableModule"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ActualNonFieldReplaceableModule"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-actual-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonActualProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "contained-holder-uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of contained-holder"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonActualProperties"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonActualProperties"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-equipment-properties/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/occupying-fru/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
+      summary: "returns tapi.equipment.EquipmentRef"
+      description: "The FRU that is occupying the holder. \r\n                A holder\
+        \ may be unoccupied. \r\n                An FRU may occupy more hat one holder\
+        \ (using or blocking are intentionally not distinguished here)."
       parameters:
       - name: "uuid"
         in: "path"
@@ -1388,18 +1270,23 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonEquipmentProperties"
+          description: "tapi.equipment.EquipmentRef"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+            $ref: "#/definitions/tapi.equipment.EquipmentRefWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-actual-properties/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/:
     get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonActualProperties"
+      summary: "returns tapi.equipment.ExpectedEquipment"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1414,13 +1301,13 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonActualProperties"
+          description: "tapi.equipment.ExpectedEquipment"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonActualProperties"
+            $ref: "#/definitions/tapi.equipment.ExpectedEquipmentWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-equipment-properties/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/common-equipment-properties/
+  : get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.equipment.CommonEquipmentProperties"
@@ -1440,18 +1327,15 @@ paths:
         200:
           description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.Holder"
-      description: "References the Holder in an Equipment that is available to take\
-        \ other Equipments.\r\n                For example:\r\n                - Slot\
-        \ in a sub-rack\r\n                - Slot in a Field Replaceable Unit that\
-        \ can take a small form-factor pluggable."
+      summary: "returns tapi.equipment.ExpectedHolder"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -1463,23 +1347,18 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.equipment.Holder"
+          description: "tapi.equipment.ExpectedHolder"
           schema:
-            $ref: "#/definitions/tapi.equipment.Holder"
+            $ref: "#/definitions/tapi.equipment.ExpectedHolderWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/common-holder-properties/
+  : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ActualHolder"
+      summary: "returns tapi.equipment.CommonHolderProperties"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1492,23 +1371,18 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.equipment.ActualHolder"
+          description: "tapi.equipment.CommonHolderProperties"
           schema:
-            $ref: "#/definitions/tapi.equipment.ActualHolder"
+            $ref: "#/definitions/tapi.equipment.CommonHolderPropertiesWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/common-holder-properties/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonHolderProperties"
+      summary: "returns tapi.equipment.ExpectedNonFieldReplaceableModule"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1521,23 +1395,18 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonHolderProperties"
+          description: "tapi.equipment.ExpectedNonFieldReplaceableModule"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+            $ref: "#/definitions/tapi.equipment.ExpectedNonFieldReplaceableModuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/common-equipment-properties/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedHolder"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1550,24 +1419,21 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.equipment.ExpectedHolder"
+          description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedHolder"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/common-holder-properties/
-  : get:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/name={value-name}/:
+    get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonHolderProperties"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -1579,20 +1445,20 @@ paths:
         description: "Id of equipment"
         required: true
         type: "string"
-      - name: "contained-holder-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of contained-holder"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonHolderProperties"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/name={value-name}/
-  : get:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/name={value-name}/:
+    get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.common.NameAndValue"
@@ -1605,16 +1471,6 @@ paths:
         description: "Id of device"
         required: true
         type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -1624,185 +1480,265 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/occupying-fru/:
-    get:
+  /data/tapi-common:context/tapi-equipment:physical-context/name/:
+    post:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.EquipmentRef"
-      description: "The FRU that is occupying the holder. \r\n                A holder\
-        \ may be unoccupied. \r\n                An FRU may occupy more hat one holder\
-        \ (using or blocking are intentionally not distinguished here)."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.equipment.EquipmentRef"
-          schema:
-            $ref: "#/definitions/tapi.equipment.EquipmentRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-equipment:physical-context/name={value-name}/:
     get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedEquipment"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.ExpectedEquipment"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedEquipment"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/common-equipment-properties/:
-    get:
+    put:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of device"
+        description: "Id of name"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-equipment"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/:
+    get:
+      tags:
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PhysicalSpan"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of physical-span"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonEquipmentProperties"
+          description: "tapi.equipment.PhysicalSpan"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+            $ref: "#/definitions/tapi.equipment.PhysicalSpanWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/:
     get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedHolder"
-      description: "none"
+      summary: "returns tapi.equipment.AbstractStrand"
+      description: "Both the serial segments that form an end-end strand and the parallel\
+        \ end-end strands."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of physical-span"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of abstract-strand"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.ExpectedHolder"
+          description: "tapi.equipment.AbstractStrand"
           schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedHolder"
+            $ref: "#/definitions/tapi.equipment.AbstractStrandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/common-holder-properties/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/adjacent-strand={physical-span-uuid},{abstract-strand-local-id}/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonHolderProperties"
+      summary: "returns tapi.equipment.AbstractStrandRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of physical-span"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "physical-span-uuid"
+        in: "path"
+        description: "Id of adjacent-strand"
+        required: true
+        type: "string"
+      - name: "abstract-strand-local-id"
+        in: "path"
+        description: "Id of adjacent-strand"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonHolderProperties"
+          description: "tapi.equipment.AbstractStrandRef"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+            $ref: "#/definitions/tapi.equipment.AbstractStrandRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedNonFieldReplaceableModule"
-      description: "none"
+      summary: "returns tapi.equipment.ConnectorPinAddress"
+      description: "A strand can end on two or more Pins (usually 2 pins, but a strand\
+        \ my be spliced to split a signal). This model supports only 2 ended strands.\r\
+        \n                A abstract strand may be spliced at both ends and hence\
+        \ have no direct relationship to pins or may be connected to pins at one or\
+        \ both ends.\r\n                In the essential model these Pins would be\
+        \ on connectors that plug in to connectors on Equipments.\r\n            \
+        \    The AbstractStrand is extended to the pins of the AccessPort which are\
+        \ the Pins on the Connectors of the Equipment.\r\n                In some\
+        \ cases it may not be relevant to represent the pin detail and hence the reference\
+        \ is to a connector alone."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "connector-identification"
+        in: "path"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "pin-identification"
+        in: "path"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       - name: "equipment-uuid"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.ExpectedNonFieldReplaceableModule"
+          description: "tapi.equipment.ConnectorPinAddress"
           schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedNonFieldReplaceableModule"
+            $ref: "#/definitions/tapi.equipment.ConnectorPinAddressWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/common-equipment-properties/
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
   : get:
       tags:
       - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
+      summary: "returns tapi.equipment.PinAndRole"
+      description: "If there is more than one pin used in a connector and/or there\
+        \ is a need to identify the role of one or more pins then this property can\
+        \ be used.\r\n                For simple cases pinIdentification can be used\
+        \ instead."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "connector-identification"
+        in: "path"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "pin-identification"
+        in: "path"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       - name: "equipment-uuid"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.CommonEquipmentProperties"
+          description: "tapi.equipment.PinAndRole"
           schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+            $ref: "#/definitions/tapi.equipment.PinAndRoleWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-equipment"
@@ -1813,12 +1749,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of physical-span"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of equipment"
+        description: "Id of abstract-strand"
         required: true
         type: "string"
       - name: "value-name"
@@ -1830,58 +1766,102 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/device={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/spliced-strand={physical-span-uuid},{abstract-strand-local-id}/
+  : get:
+      tags:
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AbstractStrandRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "physical-span-uuid"
+        in: "path"
+        description: "Id of spliced-strand"
+        required: true
+        type: "string"
+      - name: "abstract-strand-local-id"
+        in: "path"
+        description: "Id of spliced-strand"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.equipment.AbstractStrandRef"
+          schema:
+            $ref: "#/definitions/tapi.equipment.AbstractStrandRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/strand-media-characteristics={value-name}/
+  : get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      description: "Relevant physical properties of the abstract strand."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of device"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of strand-media-characteristics"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/name/:
-    post:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/access-port={device-uuid},{access-port-uuid}/:
+    get:
       tags:
       - "tapi-equipment"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.equipment.AccessPortRef"
+      description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+      - name: "uuid"
+        in: "path"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "device-uuid"
+        in: "path"
+        description: "Id of access-port"
+        required: true
+        type: "string"
+      - name: "access-port-uuid"
+        in: "path"
+        description: "Id of access-port"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.equipment.AccessPortRef"
+          schema:
+            $ref: "#/definitions/tapi.equipment.AccessPortRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/physical-context/name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-equipment"
@@ -1890,6 +1870,11 @@ paths:
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -1899,28 +1884,54 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-notification:notification-context/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.notification.NotificationContext"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
+    post:
+      tags:
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters:
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-equipment"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -1930,194 +1941,226 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-equipment"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/physical-context/physical-span={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
+    post:
+      tags:
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
     get:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.PhysicalSpan"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.PhysicalSpan"
+          description: "tapi.notification.NotificationSubscriptionService"
           schema:
-            $ref: "#/definitions/tapi.equipment.PhysicalSpan"
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/:
-    get:
+    put:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AbstractStrand"
-      description: "Both the serial segments that form an end-end strand and the parallel\
-        \ end-end strands."
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
-        200:
-          description: "tapi.equipment.AbstractStrand"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AbstractStrand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/adjacent-strand={physical-span-uuid},{abstract-strand-local-id}/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AbstractStrandRef"
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "physical-span-uuid"
-        in: "path"
-        description: "Id of adjacent-strand"
-        required: true
-        type: "string"
-      - name: "abstract-strand-local-id"
-        in: "path"
-        description: "Id of adjacent-strand"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.equipment.AbstractStrandRef"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AbstractStrandRef"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
-  : get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
+    post:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ConnectorPinAddress"
-      description: "A strand can end on two or more Pins (usually 2 pins, but a strand\
-        \ my be spliced to split a signal). This model supports only 2 ended strands.\r\
-        \n                A abstract strand may be spliced at both ends and hence\
-        \ have no direct relationship to pins or may be connected to pins at one or\
-        \ both ends.\r\n                In the essential model these Pins would be\
-        \ on connectors that plug in to connectors on Equipments.\r\n            \
-        \    The AbstractStrand is extended to the pins of the AccessPort which are\
-        \ the Pins on the Connectors of the Equipment.\r\n                In some\
-        \ cases it may not be relevant to represent the pin detail and hence the reference\
-        \ is to a connector alone."
+      - "tapi-notification"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "pin-identification"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.ConnectorPinAddress"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.equipment.ConnectorPinAddress"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
-  : get:
+    put:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.PinAndRole"
-      description: "If there is more than one pin used in a connector and/or there\
-        \ is a need to identify the role of one or more pins then this property can\
-        \ be used.\r\n                For simple cases pinIdentification can be used\
-        \ instead."
+      - "tapi-notification"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of abstract-strand"
+        description: "Id of name"
         required: true
         type: "string"
-      - name: "connector-identification"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "pin-identification"
+      - name: "value-name"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of name"
         required: true
         type: "string"
-      - name: "equipment-uuid"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationChannel"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connector-pin"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.PinAndRole"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.equipment.PinAndRole"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
-      - "tapi-equipment"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2125,12 +2168,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -2142,344 +2180,286 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/spliced-strand={physical-span-uuid},{abstract-strand-local-id}/
-  : get:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+    get:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AbstractStrandRef"
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "physical-span-uuid"
-        in: "path"
-        description: "Id of spliced-strand"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "abstract-strand-local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of spliced-strand"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.AbstractStrandRef"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.equipment.AbstractStrandRef"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/strand-media-characteristics={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
-      - "tapi-equipment"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "Relevant physical properties of the abstract strand."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of abstract-strand"
+        description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of strand-media-characteristics"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/access-port={device-uuid},{access-port-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AccessPortRef"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "device-uuid"
-        in: "path"
-        description: "Id of access-port"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "access-port-uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of access-port"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.equipment.AccessPortRef"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.equipment.AccessPortRef"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2487,7 +2467,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
@@ -2495,7 +2475,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2503,10 +2483,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2514,7 +2494,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -2526,12 +2506,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2539,7 +2519,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -2552,7 +2532,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2562,7 +2542,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2570,7 +2550,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -2583,142 +2563,162 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -2729,7 +2729,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -2743,7 +2743,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -2762,7 +2762,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -2781,7 +2781,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -2792,10 +2792,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2813,10 +2813,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -2832,10 +2832,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -2851,10 +2851,10 @@ paths:
         200:
           description: "tapi.topology.topologycontext.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.topologycontext.Topology"
+            $ref: "#/definitions/tapi.topology.topologycontext.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -2875,10 +2875,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -2899,10 +2899,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -2923,11 +2923,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2947,10 +2947,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2971,11 +2971,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2995,11 +2995,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -3019,10 +3019,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -3044,10 +3044,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -3074,11 +3074,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -3104,10 +3104,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -3135,10 +3135,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -3174,10 +3174,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -3198,11 +3198,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -3228,10 +3228,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -3253,11 +3253,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -3277,10 +3277,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3301,10 +3301,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3325,11 +3325,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -3349,10 +3349,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3373,10 +3373,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -3398,11 +3398,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -3428,10 +3428,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -3454,10 +3454,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -3478,10 +3478,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -3517,10 +3517,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -3541,10 +3541,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -3565,11 +3565,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -3589,10 +3589,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3613,11 +3613,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -3637,11 +3637,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -3661,10 +3661,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -3686,10 +3686,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -3716,10 +3716,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -3740,11 +3740,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -3770,10 +3770,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -3801,11 +3801,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -3830,11 +3830,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -3859,10 +3859,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -3888,10 +3888,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3917,10 +3917,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3946,10 +3946,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3975,10 +3975,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4004,10 +4004,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4034,10 +4034,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4069,10 +4069,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4105,10 +4105,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4157,10 +4157,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4191,10 +4191,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4225,10 +4225,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4259,10 +4259,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4293,10 +4293,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4327,10 +4327,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4361,10 +4361,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4396,10 +4396,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4436,10 +4436,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4476,10 +4476,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4517,10 +4517,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4557,10 +4557,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -4596,10 +4596,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -4647,10 +4647,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -4688,10 +4688,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4734,10 +4734,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -4775,10 +4775,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4810,10 +4810,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4844,10 +4844,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4878,10 +4878,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4912,10 +4912,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4946,10 +4946,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4980,10 +4980,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5015,10 +5015,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5050,11 +5050,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -5086,10 +5086,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -5130,10 +5130,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -5176,10 +5176,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5211,11 +5211,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -5245,10 +5245,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -5291,10 +5291,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -5327,10 +5327,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5368,10 +5368,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -5404,10 +5404,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -5434,10 +5434,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -5463,10 +5463,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5492,10 +5492,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5521,10 +5521,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5550,10 +5550,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5579,10 +5579,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5609,11 +5609,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -5638,10 +5638,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -5682,10 +5682,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -5711,10 +5711,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -5740,10 +5740,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5769,10 +5769,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5798,10 +5798,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5827,10 +5827,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5856,10 +5856,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5886,10 +5886,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -5922,10 +5922,10 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5958,10 +5958,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/supporting-access-port/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-equipment:supporting-access-port/
   : get:
       tags:
       - "tapi-equipment"
@@ -5987,10 +5987,10 @@ paths:
         200:
           description: "tapi.equipment.SupportingAccessPort"
           schema:
-            $ref: "#/definitions/tapi.equipment.SupportingAccessPort"
+            $ref: "#/definitions/tapi.equipment.SupportingAccessPortWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/supporting-access-port/access-port/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-equipment:supporting-access-port/access-port/
   : get:
       tags:
       - "tapi-equipment"
@@ -6016,10 +6016,10 @@ paths:
         200:
           description: "tapi.equipment.AccessPortRef"
           schema:
-            $ref: "#/definitions/tapi.equipment.AccessPortRef"
+            $ref: "#/definitions/tapi.equipment.AccessPortRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -6046,10 +6046,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -6075,10 +6075,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6104,10 +6104,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6133,10 +6133,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6162,10 +6162,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6191,10 +6191,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6221,11 +6221,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/supporting-physical-span/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/tapi-equipment:supporting-physical-span/
+  : get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.equipment.SupportingPhysicalSpan"
@@ -6245,11 +6245,11 @@ paths:
         200:
           description: "tapi.equipment.SupportingPhysicalSpan"
           schema:
-            $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpan"
+            $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpanWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/supporting-physical-span/physical-span/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/tapi-equipment:supporting-physical-span/physical-span/
+  : get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.equipment.PhysicalSpanRef"
@@ -6269,10 +6269,10 @@ paths:
         200:
           description: "tapi.equipment.PhysicalSpanRef"
           schema:
-            $ref: "#/definitions/tapi.equipment.PhysicalSpanRef"
+            $ref: "#/definitions/tapi.equipment.PhysicalSpanRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -6294,11 +6294,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -6318,10 +6318,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6342,10 +6342,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6366,11 +6366,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -6390,10 +6390,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6414,10 +6414,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -6439,56 +6439,66 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-common"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-common:update-service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      responses:
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-device-list/:
+  /operations/tapi-equipment:get-device-list/:
     post:
       tags:
       - "tapi-equipment"
@@ -6502,7 +6512,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-device/:
+  /operations/tapi-equipment:get-device/:
     post:
       tags:
       - "tapi-equipment"
@@ -6525,76 +6535,90 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-equipment:get-physical-span-list/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-equipment"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.equipment.GetPhysicalSpanList"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-equipment:get-physical-span/:
+    post:
+      tags:
+      - "tapi-equipment"
+      summary: "operates on tapi.equipment.GetPhysicalSpan"
+      description: "operates on tapi.equipment.GetPhysicalSpan"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.equipment.getphysicalspan.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.equipment.getphysicalspan.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.equipment.GetPhysicalSpan"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
       - "tapi-notification"
@@ -6617,7 +6641,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
       - "tapi-notification"
@@ -6640,7 +6664,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
       - "tapi-notification"
@@ -6654,95 +6678,113 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-physical-span-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-equipment"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.equipment.GetPhysicalSpanList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-physical-span/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-equipment"
-      summary: "operates on tapi.equipment.GetPhysicalSpan"
-      description: "operates on tapi.equipment.GetPhysicalSpan"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.equipment.getphysicalspan.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.equipment.getphysicalspan.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.equipment.GetPhysicalSpan"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodedetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
       - "tapi-topology"
@@ -6765,7 +6807,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
       - "tapi-topology"
@@ -6779,48 +6821,6 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/update-service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
-      responses:
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
 definitions:
   tapi.common.AdminStatePac:
     type: "object"
@@ -6872,6 +6872,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -6915,12 +6919,24 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.equipment.ContextAugmentation2"
     - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation3"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.ForwardingDirection:
     type: "string"
     enum:
@@ -6994,6 +7010,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -7045,6 +7065,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      mapped-service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7172,6 +7200,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:physical-span/tapi-equipment:abstract-strand/tapi-equipment:local-id"
       description: "none"
+  tapi.equipment.AbstractStrandRefWrapper:
+    properties:
+      adjacent-strand:
+        $ref: "#/definitions/tapi.equipment.AbstractStrandRef"
+  tapi.equipment.AbstractStrandWrapper:
+    properties:
+      abstract-strand:
+        $ref: "#/definitions/tapi.equipment.AbstractStrand"
   tapi.equipment.AccessPort:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7197,6 +7233,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:access-port/tapi-equipment:uuid"
       description: "none"
+  tapi.equipment.AccessPortRefWrapper:
+    properties:
+      access-port:
+        $ref: "#/definitions/tapi.equipment.AccessPortRef"
+  tapi.equipment.AccessPortWrapper:
+    properties:
+      access-port:
+        $ref: "#/definitions/tapi.equipment.AccessPort"
   tapi.equipment.ActualEquipment:
     type: "object"
     properties:
@@ -7211,12 +7255,20 @@ definitions:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ActualEquipmentWrapper:
+    properties:
+      actual-equipment:
+        $ref: "#/definitions/tapi.equipment.ActualEquipment"
   tapi.equipment.ActualHolder:
     type: "object"
     properties:
       common-holder-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+  tapi.equipment.ActualHolderWrapper:
+    properties:
+      actual-holder:
+        $ref: "#/definitions/tapi.equipment.ActualHolder"
   tapi.equipment.ActualNonFieldReplaceableModule:
     type: "object"
     properties:
@@ -7226,6 +7278,10 @@ definitions:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ActualNonFieldReplaceableModuleWrapper:
+    properties:
+      actual-non-field-replaceable-module:
+        $ref: "#/definitions/tapi.equipment.ActualNonFieldReplaceableModule"
   tapi.equipment.CommonActualProperties:
     type: "object"
     properties:
@@ -7251,6 +7307,10 @@ definitions:
         type: "string"
         description: "This attribute represents the asset identifier of this instance\
           \ from the manufacturer's perspective."
+  tapi.equipment.CommonActualPropertiesWrapper:
+    properties:
+      common-actual-properties:
+        $ref: "#/definitions/tapi.equipment.CommonActualProperties"
   tapi.equipment.CommonEquipmentProperties:
     type: "object"
     properties:
@@ -7276,6 +7336,10 @@ definitions:
         type: "string"
         description: "Represents the invariant properties of the equipment asset allocated\
           \ by the operator that define and characterize the type."
+  tapi.equipment.CommonEquipmentPropertiesWrapper:
+    properties:
+      common-equipment-properties:
+        $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
   tapi.equipment.CommonHolderProperties:
     type: "object"
     properties:
@@ -7292,6 +7356,10 @@ definitions:
       holder-category:
         type: "string"
         description: "The type of holder."
+  tapi.equipment.CommonHolderPropertiesWrapper:
+    properties:
+      common-holder-properties:
+        $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
   tapi.equipment.ConnectorPinAddress:
     type: "object"
     properties:
@@ -7316,6 +7384,10 @@ definitions:
           \ the connector.\r\n                Where the whole connector is used, then\
           \ individual Pins need not be identified.\r\n                Simple alternative\
           \ to pinAndRole."
+  tapi.equipment.ConnectorPinAddressWrapper:
+    properties:
+      connector-pin:
+        $ref: "#/definitions/tapi.equipment.ConnectorPinAddress"
   tapi.equipment.ContextAugmentation2:
     type: "object"
     properties:
@@ -7349,6 +7421,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:uuid"
+  tapi.equipment.DeviceWrapper:
+    properties:
+      device:
+        $ref: "#/definitions/tapi.equipment.Device"
   tapi.equipment.Equipment:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7397,6 +7473,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:equipment/tapi-equipment:uuid"
       description: "none"
+  tapi.equipment.EquipmentRefWrapper:
+    properties:
+      occupying-fru:
+        $ref: "#/definitions/tapi.equipment.EquipmentRef"
+  tapi.equipment.EquipmentWrapper:
+    properties:
+      equipment:
+        $ref: "#/definitions/tapi.equipment.Equipment"
   tapi.equipment.ExpectedEquipment:
     type: "object"
     properties:
@@ -7413,18 +7497,30 @@ definitions:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ExpectedEquipmentWrapper:
+    properties:
+      expected-equipment:
+        $ref: "#/definitions/tapi.equipment.ExpectedEquipment"
   tapi.equipment.ExpectedHolder:
     type: "object"
     properties:
       common-holder-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+  tapi.equipment.ExpectedHolderWrapper:
+    properties:
+      expected-holder:
+        $ref: "#/definitions/tapi.equipment.ExpectedHolder"
   tapi.equipment.ExpectedNonFieldReplaceableModule:
     type: "object"
     properties:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ExpectedNonFieldReplaceableModuleWrapper:
+    properties:
+      expected-non-field-replaceable-module:
+        $ref: "#/definitions/tapi.equipment.ExpectedNonFieldReplaceableModule"
   tapi.equipment.GetDevice:
     type: "object"
     properties:
@@ -7464,6 +7560,10 @@ definitions:
           $ref: "#/definitions/tapi.equipment.EquipmentRef"
       description: "Represents a space in an equipment in which another equipment\
         \ can be fitted in the field."
+  tapi.equipment.HolderWrapper:
+    properties:
+      contained-holder:
+        $ref: "#/definitions/tapi.equipment.Holder"
   tapi.equipment.NodeAugmentation1:
     type: "object"
     properties:
@@ -7498,6 +7598,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.equipment.PhysicalSpan"
       description: "none"
+  tapi.equipment.PhysicalContextWrapper:
+    properties:
+      tapi-equipment:physical-context:
+        $ref: "#/definitions/tapi.equipment.PhysicalContext"
   tapi.equipment.PhysicalSpan:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7524,6 +7628,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:physical-span/tapi-equipment:uuid"
+  tapi.equipment.PhysicalSpanRefWrapper:
+    properties:
+      physical-span:
+        $ref: "#/definitions/tapi.equipment.PhysicalSpanRef"
+  tapi.equipment.PhysicalSpanWrapper:
+    properties:
+      physical-span:
+        $ref: "#/definitions/tapi.equipment.PhysicalSpan"
   tapi.equipment.PinAndRole:
     type: "object"
     properties:
@@ -7551,18 +7663,30 @@ definitions:
         description: "Where the pin has a distinct location identifier and a distinct\
           \ name this field can be used for the name.\r\n                For example:\r\
           \n                - locationInConnector = 6, pinName = GND"
+  tapi.equipment.PinAndRoleWrapper:
+    properties:
+      pin-and-role:
+        $ref: "#/definitions/tapi.equipment.PinAndRole"
   tapi.equipment.SupportingAccessPort:
     type: "object"
     properties:
       access-port:
         description: "none"
         $ref: "#/definitions/tapi.equipment.AccessPortRef"
+  tapi.equipment.SupportingAccessPortWrapper:
+    properties:
+      tapi-equipment:supporting-access-port:
+        $ref: "#/definitions/tapi.equipment.SupportingAccessPort"
   tapi.equipment.SupportingPhysicalSpan:
     type: "object"
     properties:
       physical-span:
         description: "none"
         $ref: "#/definitions/tapi.equipment.PhysicalSpanRef"
+  tapi.equipment.SupportingPhysicalSpanWrapper:
+    properties:
+      tapi-equipment:supporting-physical-span:
+        $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpan"
   tapi.equipment.getdevice.Input:
     type: "object"
     properties:
@@ -7633,6 +7757,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -7684,6 +7812,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7756,6 +7888,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -7769,6 +7905,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7799,6 +7939,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -7807,6 +7951,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -7895,6 +8043,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -7927,6 +8079,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -8046,6 +8202,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation3:
     type: "object"
     properties:
@@ -8069,6 +8229,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -8125,6 +8289,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -8151,6 +8319,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -8195,6 +8367,10 @@ definitions:
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "The Link object class models effective adjacency between two or\
         \ more ForwardingDomains (FD). "
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8206,6 +8382,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -8295,6 +8475,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -8350,6 +8534,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -8372,6 +8564,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -8392,6 +8588,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -8417,6 +8617,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -8531,6 +8735,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -8550,6 +8758,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8587,6 +8799,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -8594,6 +8810,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -8659,6 +8879,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -8740,6 +8964,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.equipment.OwnedNodeEdgePointAugmentation1"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -8775,6 +9003,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
   tapi.topology.topologycontext.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8796,3 +9028,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.topology.Node"
       description: "none"
+  tapi.topology.topologycontext.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.topologycontext.Topology"
diff --git a/OAS/tapi-eth@2020-04-23.yaml b/OAS/tapi-eth@2020-04-23.yaml
index 3c783a89..f8c04164 100644
--- a/OAS/tapi-eth@2020-04-23.yaml
+++ b/OAS/tapi-eth@2020-04-23.yaml
@@ -1,24 +1,24 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Connectivity Model definitions.\r\
-    \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI OAM Model definitions.\r\
+    \ the Apache License 2.0,\r\n        This module contains TAPI OAM Model definitions.\r\
     \n        Source: TapiOam.uml\r\n        - The TAPI YANG models included in this\
     \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
     \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
@@ -35,41 +35,41 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
-    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -137,8 +137,8 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0"
-  version: "2.2.0"
-  title: "tapi-connectivity,tapi-oam,tapi-topology,tapi-notification,tapi-common,tapi-path-computation,tapi-eth,tapi-dsr\
+  version: "2.1.3"
+  title: "tapi-notification,tapi-oam,tapi-connectivity,tapi-topology,tapi-common,tapi-path-computation,tapi-eth,tapi-dsr\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -146,7 +146,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -157,7 +157,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -171,7 +171,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -190,7 +190,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -209,32 +209,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -242,18 +231,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -263,234 +280,274 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
-    get:
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -502,50 +559,51 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
-    get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ResilienceRoute"
-      description: "Provides optional resilience and state attributes to the Route."
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of route"
+        description: "Id of name"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.ResilienceRoute"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -554,193 +612,677 @@ paths:
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LinkRef"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControl"
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.SwitchControl"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.ResilienceType"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControlRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of sub-switch-control"
-        required: true
-        type: "string"
-      - name: "sub-switch-control-switch-control-uuid"
-        in: "path"
-        description: "Id of sub-switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.SwitchControlRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Switch"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of switch"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Switch"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityContext"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Connection"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of lower-connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Route"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ResilienceRoute"
+      description: "Provides optional resilience and state attributes to the Route."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ResilienceRoute"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.LinkRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of supported-client-link"
+        required: true
+        type: "string"
+      - name: "link-uuid"
+        in: "path"
+        description: "Id of supported-client-link"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.SwitchControl"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.SwitchControl"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.ResilienceType"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.ResilienceType"
+          schema:
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.SwitchControlRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of sub-switch-control"
+        required: true
+        type: "string"
+      - name: "sub-switch-control-switch-control-uuid"
+        in: "path"
+        description: "Id of sub-switch-control"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.SwitchControlRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Switch"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of switch"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Switch"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
         in: "path"
         description: "Id of connection"
         required: true
@@ -764,10 +1306,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -813,10 +1355,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -852,10 +1394,10 @@ paths:
         200:
           description: "tapi.connectivity.RouteRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
     post:
       tags:
       - "tapi-connectivity"
@@ -867,7 +1409,7 @@ paths:
         description: "tapi.connectivity.ConnectivityService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -875,7 +1417,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -891,7 +1433,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityService"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -910,7 +1452,7 @@ paths:
         description: "tapi.connectivity.ConnectivityService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -934,7 +1476,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -955,10 +1497,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
     get:
       tags:
       - "tapi-connectivity"
@@ -974,7 +1516,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -993,7 +1535,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1017,7 +1559,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1041,7 +1583,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1059,7 +1601,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1067,7 +1609,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1089,7 +1631,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -1114,7 +1656,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1144,7 +1686,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1161,7 +1703,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1169,8 +1711,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceRef"
@@ -1190,7 +1732,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -1214,7 +1756,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1243,7 +1785,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1261,7 +1803,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1269,7 +1811,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1290,7 +1832,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -1315,7 +1857,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1344,7 +1886,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1365,7 +1907,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -1389,7 +1931,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1418,7 +1960,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1447,8 +1989,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -1468,7 +2010,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -1492,7 +2034,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1521,7 +2063,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1550,7 +2092,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1571,7 +2113,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1595,7 +2137,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1624,7 +2166,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1653,7 +2195,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1674,7 +2216,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1698,7 +2240,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1727,7 +2269,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1756,8 +2298,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1777,7 +2319,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1801,7 +2343,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1830,7 +2372,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1859,7 +2401,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1880,7 +2422,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1904,7 +2446,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1933,7 +2475,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1962,8 +2504,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1984,7 +2526,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -2009,7 +2551,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2039,7 +2581,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2069,7 +2611,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -2110,10 +2652,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2137,7 +2679,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2145,8 +2687,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -2173,7 +2715,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2204,7 +2746,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2240,8 +2782,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2261,7 +2803,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2286,7 +2828,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2316,7 +2858,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2345,8 +2887,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2366,7 +2908,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2391,7 +2933,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2421,7 +2963,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2450,8 +2992,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2471,7 +3013,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2496,7 +3038,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2526,7 +3068,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2555,8 +3097,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -2576,7 +3118,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2600,7 +3142,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2629,7 +3171,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2658,7 +3200,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2676,7 +3218,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2684,8 +3226,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -2706,7 +3248,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -2731,7 +3273,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2761,7 +3303,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2777,7 +3319,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2796,7 +3338,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2820,7 +3362,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2844,7 +3386,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2860,7 +3402,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2879,7 +3421,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2903,7 +3445,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2927,7 +3469,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2943,7 +3485,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2962,7 +3504,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2986,7 +3528,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3010,7 +3552,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3029,7 +3571,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3037,7 +3579,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3060,7 +3602,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -3086,7 +3628,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3117,7 +3659,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3133,7 +3675,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3152,7 +3694,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3176,7 +3718,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3200,8 +3742,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -3216,7 +3758,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -3235,7 +3777,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3259,7 +3801,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3283,8 +3825,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3299,7 +3841,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3318,7 +3860,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3342,7 +3884,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3366,8 +3908,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3382,7 +3924,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3401,7 +3943,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3425,7 +3967,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3449,8 +3991,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3465,7 +4007,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3484,7 +4026,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3508,7 +4050,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3532,8 +4074,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3548,7 +4090,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3567,7 +4109,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3591,7 +4133,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3615,7 +4157,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3632,7 +4174,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3652,7 +4194,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3677,7 +4219,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3702,7 +4244,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3718,7 +4260,7 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
     post:
@@ -3737,7 +4279,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3761,7 +4303,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3785,7 +4327,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3802,7 +4344,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3810,8 +4352,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -3831,7 +4373,7 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -3855,7 +4397,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3884,7 +4426,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3900,7 +4442,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -3919,7 +4461,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3943,7 +4485,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3954,99 +4496,12 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.TimeRange"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/name={value-name}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.common.TimeRange"
+      description: "none"
       parameters:
-      - name: "value-name"
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -4054,7 +4509,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
@@ -4065,7 +4520,7 @@ paths:
         200:
           description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4079,7 +4534,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4098,7 +4553,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4117,7 +4572,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
@@ -4130,7 +4585,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4138,7 +4593,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4154,7 +4609,7 @@ paths:
         200:
           description: "tapi.notification.NotificationSubscriptionService"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -4174,7 +4629,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4198,7 +4653,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4217,7 +4672,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4225,7 +4680,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4248,7 +4703,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4274,7 +4729,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4305,7 +4760,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
@@ -4321,11 +4776,11 @@ paths:
         200:
           description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4347,10 +4802,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4371,11 +4826,11 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4400,11 +4855,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.AlarmInfo"
@@ -4424,11 +4879,11 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.NameAndValueChange"
@@ -4453,11 +4908,11 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4484,11 +4939,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4513,11 +4968,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.TcaInfo"
@@ -4537,10 +4992,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
       - "tapi-notification"
@@ -4556,7 +5011,7 @@ paths:
         200:
           description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
@@ -4575,7 +5030,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4599,7 +5054,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4623,7 +5078,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4642,7 +5097,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4650,8 +5105,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4673,7 +5128,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4699,7 +5154,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4730,7 +5185,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4746,10 +5201,10 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4770,10 +5225,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
       - "tapi-notification"
@@ -4789,10 +5244,10 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4813,10 +5268,10 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4839,10 +5294,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4863,10 +5318,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
       - "tapi-notification"
@@ -4882,10 +5337,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/:
+  /data/tapi-common:context/tapi-oam:oam-context/:
     get:
       tags:
       - "tapi-oam"
@@ -4896,7 +5351,7 @@ paths:
         200:
           description: "tapi.oam.context.OamContext"
           schema:
-            $ref: "#/definitions/tapi.oam.context.OamContext"
+            $ref: "#/definitions/tapi.oam.context.OamContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4910,7 +5365,7 @@ paths:
         description: "tapi.oam.context.OamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.context.OamContext"
+          $ref: "#/definitions/tapi.oam.context.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4929,7 +5384,7 @@ paths:
         description: "tapi.oam.context.OamContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.context.OamContext"
+          $ref: "#/definitions/tapi.oam.context.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4948,7 +5403,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/meg={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -4964,37 +5419,44 @@ paths:
         200:
           description: "tapi.oam.oamcontext.Meg"
           schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.Meg"
+            $ref: "#/definitions/tapi.oam.oamcontext.MegWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/eth-meg-spec/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMegSpec"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.meg.Mep"
+      description: "1. ME may have 0 MEPs (case of transit domains where at least\
+        \ 1 MIP is present)\r\n                2. ME may have 1 MEP (case of edge\
+        \ domaind, where the peer MEP is ouside the managed domain)\r\n          \
+        \      3. ME may have 2 MEPs"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of meg"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthMegSpec"
+          description: "tapi.oam.meg.Mep"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMegSpec"
+            $ref: "#/definitions/tapi.oam.meg.MepWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.meg.Mep"
-      description: "1. ME may have 0 MEPs (case of transit domains where at least\
-        \ 1 MIP is present)\r\n                2. ME may have 1 MEP (case of edge\
-        \ domaind, where the peer MEP is ouside the managed domain)\r\n          \
-        \      3. ME may have 2 MEPs"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5006,14 +5468,19 @@ paths:
         description: "Id of mep"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.oam.meg.Mep"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.meg.Mep"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/:
     get:
       tags:
       - "tapi-eth"
@@ -5034,10 +5501,10 @@ paths:
         200:
           description: "tapi.eth.EthMepSpec"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMepSpec"
+            $ref: "#/definitions/tapi.eth.EthMepSpecWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-common/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-common/:
     get:
       tags:
       - "tapi-eth"
@@ -5058,10 +5525,10 @@ paths:
         200:
           description: "tapi.eth.EthMepCommon"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMepCommon"
+            $ref: "#/definitions/tapi.eth.EthMepCommonWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-sink/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-sink/:
     get:
       tags:
       - "tapi-eth"
@@ -5082,10 +5549,10 @@ paths:
         200:
           description: "tapi.eth.EthMepSink"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMepSink"
+            $ref: "#/definitions/tapi.eth.EthMepSinkWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-sink/bandwidth-report/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-sink/bandwidth-report/:
     get:
       tags:
       - "tapi-eth"
@@ -5107,10 +5574,10 @@ paths:
         200:
           description: "tapi.eth.BandwidthReport"
           schema:
-            $ref: "#/definitions/tapi.eth.BandwidthReport"
+            $ref: "#/definitions/tapi.eth.BandwidthReportWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-source-pac/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-source-pac/:
     get:
       tags:
       - "tapi-eth"
@@ -5131,17 +5598,15 @@ paths:
         200:
           description: "tapi.eth.EthMepSource"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMepSource"
+            $ref: "#/definitions/tapi.eth.EthMepSourceWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.oam.meg.Mip"
+      description: "ME may 0, 1, or more MIPs"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5150,27 +5615,24 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.oam.meg.Mip"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.meg.MipWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.meg.Mip"
-      description: "ME may 0, 1, or more MIPs"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5182,14 +5644,19 @@ paths:
         description: "Id of mip"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.oam.meg.Mip"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.meg.Mip"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/eth-mip-spec/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-eth:eth-mip-spec/:
     get:
       tags:
       - "tapi-eth"
@@ -5210,10 +5677,10 @@ paths:
         200:
           description: "tapi.eth.EthMipSpec"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMipSpec"
+            $ref: "#/definitions/tapi.eth.EthMipSpecWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5227,11 +5694,6 @@ paths:
         description: "Id of meg"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -5241,36 +5703,29 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/tapi-eth:eth-meg-spec/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthMegSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of meg"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.eth.EthMegSpec"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.eth.EthMegSpecWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -5282,7 +5737,7 @@ paths:
         description: "tapi.oam.oamcontext.OamJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
+          $ref: "#/definitions/tapi.oam.oamcontext.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5290,7 +5745,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5306,7 +5761,7 @@ paths:
         200:
           description: "tapi.oam.oamcontext.OamJob"
           schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
+            $ref: "#/definitions/tapi.oam.oamcontext.OamJobWrapper"
         400:
           description: "Internal error"
     put:
@@ -5325,7 +5780,7 @@ paths:
         description: "tapi.oam.oamcontext.OamJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
+          $ref: "#/definitions/tapi.oam.oamcontext.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5349,66 +5804,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-link-trace-job/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLinkTraceJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthLinkTraceJob"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthLinkTraceJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthLinkTraceJob.body-param"
-        description: "tapi.eth.EthLinkTraceJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthLinkTraceJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.eth.EthLinkTraceJob.body-param"
-        description: "tapi.eth.EthLinkTraceJob to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5418,25 +5890,32 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthLinkTraceJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-link-trace-job/eth-lt-msg/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-profile/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOamOperationCommonPac"
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5446,15 +5925,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOamOperationCommonPac"
+          description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOamOperationCommonPac"
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5463,11 +5942,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthOamOperationCommonPac.body-param"
-        description: "tapi.eth.EthOamOperationCommonPac to be added to list"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5477,8 +5956,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOamOperationCommonPac"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5487,11 +5966,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthOamOperationCommonPac.body-param"
-        description: "tapi.eth.EthOamOperationCommonPac to be added or updated"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5501,43 +5980,25 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOamOperationCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-loopback-job/:
-    get:
-      tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLoopbackJob"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.eth.EthLoopbackJob"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+        type: "string"
+      responses:
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point/:
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthLoopbackJob"
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5546,11 +6007,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthLoopbackJob.body-param"
-        description: "tapi.eth.EthLoopbackJob to be added to list"
+        name: "tapi.oam.OamServiceEndPointRef.body-param"
+        description: "tapi.oam.OamServiceEndPointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5558,10 +6019,39 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/
+  : get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamServiceEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - name: "oam-service-uuid"
+        in: "path"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      - name: "oam-service-end-point-local-id"
+        in: "path"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.OamServiceEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthLoopbackJob"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5569,12 +6059,22 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "oam-service-uuid"
+        in: "path"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      - name: "oam-service-end-point-local-id"
+        in: "path"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.eth.EthLoopbackJob.body-param"
-        description: "tapi.eth.EthLoopbackJob to be added or updated"
+        name: "tapi.oam.OamServiceEndPointRef.body-param"
+        description: "tapi.oam.OamServiceEndPointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5584,8 +6084,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthLoopbackJob"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5593,34 +6093,54 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "oam-service-uuid"
+        in: "path"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      - name: "oam-service-end-point-local-id"
+        in: "path"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-loopback-job/eth-lb-msg/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOamMsgCommonPac"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.oamjob.PmCurrentData"
+      description: "Granularity period of the CurrentData identifies the specific\
+        \ CurrentData instance in the scope of this OamJob.\r\n                For\
+        \ example, typically at least\r\n                one 15min and\r\n       \
+        \         one 24hr;\r\n                optionally one additional configurable\
+        \ (< 15min)"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOamMsgCommonPac"
+          description: "tapi.oam.oamjob.PmCurrentData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+            $ref: "#/definitions/tapi.oam.oamjob.PmCurrentDataWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOamMsgCommonPac"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimeInterval"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5628,47 +6148,23 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.TimeInterval"
+          schema:
+            $ref: "#/definitions/tapi.common.TimeIntervalWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOamMsgCommonPac"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5676,16 +6172,28 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "unit"
+        in: "path"
+        description: "Id of period"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-1way-measurement-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1wayMeasurementJob"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5693,65 +6201,86 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemand1wayMeasurementJob"
+          description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemand1wayMeasurementJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemand1wayMeasurementJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.pmcurrentdata.PmHistoryData"
+      description: "in case of 24hr Current Data, at least 1 History Data.\r\n   \
+        \             In case of 15min Current Data, at least 16 History Data.\r\n\
+        \                In case of <15min, the number of History Data shall be able\
+        \ to cover a span of 4 hours."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.pmcurrentdata.PmHistoryData"
+          schema:
+            $ref: "#/definitions/tapi.oam.pmcurrentdata.PmHistoryDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemand1wayMeasurementJob"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5759,34 +6288,64 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-1way-measurement-job/on-demand-control-1way-sink/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandMeasurementJobControlSink"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSink"
+      summary: "returns tapi.eth.EthOnDemand1DmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5794,66 +6353,58 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemand1DmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand frame delay\
+        \ measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.OnDemandDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-1way-measurement-job/on-demand-control-1way-source/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthOnDemand1LmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5861,42 +6412,58 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
+          description: "tapi.eth.EthOnDemand1LmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand synthetic\
+        \ loss measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthOnDemandDmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5904,59 +6471,88 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemandDmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand frame delay\
+        \ measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.OnDemandDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-2way-measurement-job/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand2wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand frame delay\
+        \ measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemand2wayMeasurementJob"
+          description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemand2wayMeasurementJob"
+      summary: "returns tapi.eth.EthOnDemandLmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5964,64 +6560,88 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemandLmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemand2wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand synthetic\
+        \ loss measurement job in the egress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+        200:
+          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemand2wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand synthetic\
+        \ loss measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-2way-measurement-job/on-demand-control-2way-source/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthProActive1DmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6029,42 +6649,57 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
+          description: "tapi.eth.EthProActive1DmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthProActive1LmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6072,41 +6707,57 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthProActive1LmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-1way-measurement-job/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive1wayMeasurementJob"
+      summary: "returns tapi.eth.EthProActiveDmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6114,82 +6765,116 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActive1wayMeasurementJob"
+          description: "tapi.eth.EthProActiveDmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical bidirectional performnace\
+        \ parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive1wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical far end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive1wayMeasurementJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-1way-measurement-job/pro-active-control-1way-sink/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSink"
+      summary: "returns tapi.eth.EthProActiveLmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6197,67 +6882,86 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActiveMeasurementJobControlSink"
+          description: "tapi.eth.EthProActiveLmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
+            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSink"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the statistical far end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSink"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-link-trace-result-data/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSink"
+      summary: "returns tapi.eth.EthLinkTraceResultData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6265,34 +6969,55 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.EthLinkTraceResultData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthLinkTraceResultDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-1way-measurement-job/pro-active-control-1way-source/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-link-trace-result-data/result-list={source-address}/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.LinkTraceResult"
+      description: "G.8052: This parameter returns the results of the LT process.\
+        \ It contains a list of the result received from the individual LTR frames.\r\
+        \n                The result from the individual LTR frame include the Source\
+        \ Mac Address, the TTL, and TLV."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "source-address"
+        in: "path"
+        description: "Id of result-list"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
+          description: "tapi.eth.LinkTraceResult"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.eth.LinkTraceResultWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-loopback-result-data/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthLoopbackResultData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6300,24 +7025,23 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthLoopbackResultData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthLoopbackResultDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthOnDemand1DmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6325,41 +7049,48 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemand1DmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand frame delay\
+        \ measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.OnDemandDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-2way-measurement-job/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive2wayMeasurementJob"
+      summary: "returns tapi.eth.EthOnDemand1LmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6367,41 +7098,48 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActive2wayMeasurementJob"
+          description: "tapi.eth.EthOnDemand1LmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthProActive2wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand synthetic\
+        \ loss measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive2wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActive2wayMeasurementJob"
+      summary: "returns tapi.eth.EthOnDemandDmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6409,58 +7147,73 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive2wayMeasurementJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemandDmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthProActive2wayMeasurementJob"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand frame delay\
+        \ measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.OnDemandDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-2way-measurement-job/pro-active-control-2way-source/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand frame delay\
+        \ measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
+          description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthOnDemandLmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6468,66 +7221,73 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemandLmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand synthetic\
+        \ loss measurement job in the egress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
+      description: "This attribute contains the results of an on-demand synthetic\
+        \ loss measurement job in the ingress direction."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-test-job/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthTestJob"
+      summary: "returns tapi.eth.EthProActive1DmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6535,41 +7295,47 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthTestJob"
+          description: "tapi.eth.EthProActive1DmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthTestJob"
+            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthTestJob"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthTestJob.body-param"
-        description: "tapi.eth.EthTestJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthTestJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthTestJob"
+      summary: "returns tapi.eth.EthProActive1LmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6577,40 +7343,47 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthTestJob.body-param"
-        description: "tapi.eth.EthTestJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthTestJob"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthProActive1LmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthTestJob"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-test-job/eth-test-msg/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOamMsgCommonPac"
+      summary: "returns tapi.eth.EthProActiveDmPerformanceData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6618,189 +7391,192 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOamMsgCommonPac"
+          description: "tapi.eth.EthProActiveDmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthOamMsgCommonPac"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical bidirectional performnace\
+        \ parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical far end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthOamMsgCommonPac"
-      description: "none"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-lm-performance-data/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthProActiveLmPerformanceData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthProActiveLmPerformanceData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the statistical far end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the statistical near end performnace parameters."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-test-result-data/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthTestResultData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.eth.EthTestResultData"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthTestResultDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/schedule/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.OamProfileRef"
+      summary: "returns tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6810,15 +7586,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.oam.OamProfileRef"
+          description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-oam"
-      summary: "creates tapi.oam.OamProfileRef"
+      summary: "creates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6827,11 +7603,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added to list"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -6842,7 +7618,7 @@ paths:
     put:
       tags:
       - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamProfileRef"
+      summary: "creates or updates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6851,11 +7627,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added or updated"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -6866,7 +7642,7 @@ paths:
     delete:
       tags:
       - "tapi-oam"
-      summary: "removes tapi.oam.OamProfileRef"
+      summary: "removes tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6879,11 +7655,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point/:
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-link-trace-job/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamServiceEndPointRef"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6891,24 +7667,17 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.OamServiceEndPointRef.body-param"
-        description: "tapi.oam.OamServiceEndPointRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthLinkTraceJob"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthLinkTraceJobWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamServiceEndPointRef"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6916,27 +7685,23 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "oam-service-uuid"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
-      - name: "oam-service-end-point-local-id"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthLinkTraceJob.body-param"
+        description: "tapi.eth.EthLinkTraceJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthLinkTraceJobWrapper"
       responses:
-        200:
-          description: "tapi.oam.OamServiceEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamServiceEndPointRef"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6944,22 +7709,12 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "oam-service-uuid"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
-      - name: "oam-service-end-point-local-id"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.oam.OamServiceEndPointRef.body-param"
-        description: "tapi.oam.OamServiceEndPointRef to be added or updated"
+        name: "tapi.eth.EthLinkTraceJob.body-param"
+        description: "tapi.eth.EthLinkTraceJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.eth.EthLinkTraceJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -6969,8 +7724,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamServiceEndPointRef"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6978,54 +7733,34 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "oam-service-uuid"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
-      - name: "oam-service-end-point-local-id"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-link-trace-job/eth-lt-msg/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.oamjob.PmCurrentData"
-      description: "Granularity period of the CurrentData identifies the specific\
-        \ CurrentData instance in the scope of this OamJob.\r\n                For\
-        \ example, typically at least\r\n                one 15min and\r\n       \
-        \         one 24hr;\r\n                optionally one additional configurable\
-        \ (< 15min)"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOamOperationCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.oam.oamjob.PmCurrentData"
+          description: "tapi.eth.EthOamOperationCommonPac"
           schema:
-            $ref: "#/definitions/tapi.oam.oamjob.PmCurrentData"
+            $ref: "#/definitions/tapi.eth.EthOamOperationCommonPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimeInterval"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOamOperationCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7033,23 +7768,23 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOamOperationCommonPac.body-param"
+        description: "tapi.eth.EthOamOperationCommonPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPacWrapper"
       responses:
-        200:
-          description: "tapi.common.TimeInterval"
-          schema:
-            $ref: "#/definitions/tapi.common.TimeInterval"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOamOperationCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7057,28 +7792,23 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "unit"
-        in: "path"
-        description: "Id of period"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOamOperationCommonPac.body-param"
+        description: "tapi.eth.EthOamOperationCommonPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPacWrapper"
       responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-link-trace-result-data/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthLinkTraceResultData"
+      summary: "removes tapi.eth.EthOamOperationCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7086,55 +7816,34 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.EthLinkTraceResultData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-link-trace-result-data/result-list={source-address}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-loopback-job/:
     get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.LinkTraceResult"
-      description: "G.8052: This parameter returns the results of the LT process.\
-        \ It contains a list of the result received from the individual LTR frames.\r\
-        \n                The result from the individual LTR frame include the Source\
-        \ Mac Address, the TTL, and TLV."
+      summary: "returns tapi.eth.EthLoopbackJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "source-address"
-        in: "path"
-        description: "Id of result-list"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.LinkTraceResult"
+          description: "tapi.eth.EthLoopbackJob"
           schema:
-            $ref: "#/definitions/tapi.eth.LinkTraceResult"
+            $ref: "#/definitions/tapi.eth.EthLoopbackJobWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-loopback-result-data/:
-    get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthLoopbackResultData"
+      summary: "creates tapi.eth.EthLoopbackJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7142,23 +7851,47 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.eth.EthLoopbackJob.body-param"
+        description: "tapi.eth.EthLoopbackJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthLoopbackJobWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthLoopbackJob"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.eth.EthLoopbackJob.body-param"
+        description: "tapi.eth.EthLoopbackJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthLoopbackJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthLoopbackResultData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-dm-performance-data/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1DmPerformanceData"
+      summary: "removes tapi.eth.EthLoopbackJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7166,48 +7899,58 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-loopback-job/eth-lb-msg/:
+    get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOamMsgCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemand1DmPerformanceData"
+          description: "tapi.eth.EthOamMsgCommonPac"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand frame delay\
-        \ measurement job in the ingress direction."
+      summary: "creates tapi.eth.EthOamMsgCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-lm-performance-data/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1LmPerformanceData"
+      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7215,48 +7958,40 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemand1LmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand synthetic\
-        \ loss measurement job in the ingress direction."
+      summary: "removes tapi.eth.EthOamMsgCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.OnDemandLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-dm-performance-data/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-1way-measurement-job/:
     get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandDmPerformanceData"
+      summary: "returns tapi.eth.EthOnDemand1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7264,73 +7999,65 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandDmPerformanceData"
+          description: "tapi.eth.EthOnDemand1wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJobWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand frame delay\
-        \ measurement job in the ingress direction."
+      summary: "creates tapi.eth.EthOnDemand1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand frame delay\
-        \ measurement job in the ingress direction."
+      summary: "creates or updates tapi.eth.EthOnDemand1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-lm-performance-data/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandLmPerformanceData"
+      summary: "removes tapi.eth.EthOnDemand1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7338,73 +8065,59 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemandLmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-1way-measurement-job/on-demand-control-1way-sink/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand synthetic\
-        \ loss measurement job in the egress direction."
+      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          description: "tapi.eth.EthOnDemandMeasurementJobControlSink"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand synthetic\
-        \ loss measurement job in the ingress direction."
+      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-dm-performance-data/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive1DmPerformanceData"
+      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSink"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7412,47 +8125,41 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthProActive1DmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-lm-performance-data/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-1way-measurement-job/on-demand-control-1way-source/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive1LmPerformanceData"
+      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7460,144 +8167,126 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActive1LmPerformanceData"
+          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveDmPerformanceData"
+      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthProActiveDmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical bidirectional performnace\
-        \ parameters."
+      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
-  : get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-2way-measurement-job/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical far end performnace parameters."
+      summary: "returns tapi.eth.EthOnDemand2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthOnDemand2wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJobWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "creates tapi.eth.EthOnDemand2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-lm-performance-data/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveLmPerformanceData"
+      summary: "creates or updates tapi.eth.EthOnDemand2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7605,71 +8294,58 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthProActiveLmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the statistical far end performnace parameters."
+      summary: "removes tapi.eth.EthOnDemand2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-2way-measurement-job/on-demand-control-2way-source/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-test-result-data/:
-    get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthTestResultData"
+      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7677,23 +8353,24 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthTestResultData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthTestResultData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7701,86 +8378,59 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-1way-measurement-job/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.pmcurrentdata.PmHistoryData"
-      description: "in case of 24hr Current Data, at least 1 History Data.\r\n   \
-        \             In case of 15min Current Data, at least 16 History Data.\r\n\
-        \                In case of <15min, the number of History Data shall be able\
-        \ to cover a span of 4 hours."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthProActive1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.oam.pmcurrentdata.PmHistoryData"
+          description: "tapi.eth.EthProActive1wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.oam.pmcurrentdata.PmHistoryData"
+            $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJobWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-dm-performance-data/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1DmPerformanceData"
+      summary: "creates tapi.eth.EthProActive1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7788,58 +8438,47 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive1wayMeasurementJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemand1DmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand frame delay\
-        \ measurement job in the ingress direction."
+      summary: "creates or updates tapi.eth.EthProActive1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive1wayMeasurementJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-lm-performance-data/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1LmPerformanceData"
+      summary: "removes tapi.eth.EthProActive1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7847,58 +8486,34 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemand1LmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-1way-measurement-job/pro-active-control-1way-sink/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand synthetic\
-        \ loss measurement job in the ingress direction."
+      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.OnDemandLmPerformanceParameters"
+          description: "tapi.eth.EthProActiveMeasurementJobControlSink"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSinkWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-dm-performance-data/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandDmPerformanceData"
+      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSink"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7906,88 +8521,66 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSinkWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemandDmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand frame delay\
-        \ measurement job in the ingress direction."
+      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSinkWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandDmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand frame delay\
-        \ measurement job in the ingress direction."
+      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.OnDemandDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-lm-performance-data/
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-1way-measurement-job/pro-active-control-1way-source/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandLmPerformanceData"
+      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7995,88 +8588,67 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandLmPerformanceData"
+          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand synthetic\
-        \ loss measurement job in the egress direction."
+      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.OnDemandLmPerformanceParameters"
-      description: "This attribute contains the results of an on-demand synthetic\
-        \ loss measurement job in the ingress direction."
+      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.OnDemandLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-dm-performance-data/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive1DmPerformanceData"
+      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8084,57 +8656,34 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.EthProActive1DmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
-  : get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-2way-measurement-job/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "returns tapi.eth.EthProActive2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthProActive2wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJobWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-lm-performance-data/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive1LmPerformanceData"
+      summary: "creates tapi.eth.EthProActive2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8142,57 +8691,47 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.eth.EthProActive1LmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+      - in: "body"
+        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive2wayMeasurementJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJobWrapper"
+      responses:
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "creates or updates tapi.eth.EthProActive2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive2wayMeasurementJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveDmPerformanceData"
+      summary: "removes tapi.eth.EthProActive2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8200,116 +8739,84 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.EthProActiveDmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-2way-measurement-job/pro-active-control-2way-source/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical bidirectional performnace\
-        \ parameters."
+      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical far end performnace parameters."
+      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-lm-performance-data/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveLmPerformanceData"
+      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8317,86 +8824,58 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.eth.EthProActiveLmPerformanceData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
-  : get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-test-job/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the statistical far end performnace parameters."
+      summary: "returns tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          description: "tapi.eth.EthTestJob"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthTestJobWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
-  : get:
+    post:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the statistical near end performnace parameters."
+      summary: "creates tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthTestJob.body-param"
+        description: "tapi.eth.EthTestJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthTestJobWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthTestJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8404,64 +8883,40 @@ paths:
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.EthTestJob.body-param"
+        description: "tapi.eth.EthTestJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthTestJobWrapper"
       responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/schedule/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-test-job/eth-test-msg/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimeRange"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8471,15 +8926,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimeRange"
+          description: "tapi.eth.EthOamMsgCommonPac"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimeRange"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8488,11 +8943,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added to list"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8502,8 +8957,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimeRange"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8512,11 +8967,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added or updated"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8526,8 +8981,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimeRange"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8540,7 +8995,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile/:
     post:
       tags:
       - "tapi-oam"
@@ -8552,7 +9007,7 @@ paths:
         description: "tapi.oam.oamcontext.OamProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
+          $ref: "#/definitions/tapi.oam.oamcontext.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -8560,7 +9015,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -8576,7 +9031,7 @@ paths:
         200:
           description: "tapi.oam.oamcontext.OamProfile"
           schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
+            $ref: "#/definitions/tapi.oam.oamcontext.OamProfileWrapper"
         400:
           description: "Internal error"
     put:
@@ -8595,7 +9050,7 @@ paths:
         description: "tapi.oam.oamcontext.OamProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
+          $ref: "#/definitions/tapi.oam.oamcontext.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -8619,7 +9074,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -8638,7 +9093,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8646,7 +9101,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -8669,7 +9124,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -8695,7 +9150,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8726,7 +9181,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data/:
     post:
       tags:
       - "tapi-oam"
@@ -8743,7 +9198,7 @@ paths:
         description: "tapi.oam.PmBinData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -8751,7 +9206,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -8772,7 +9227,7 @@ paths:
         200:
           description: "tapi.oam.PmBinData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmBinData"
+            $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -8796,7 +9251,7 @@ paths:
         description: "tapi.oam.PmBinData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -8825,7 +9280,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -8846,7 +9301,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -8870,7 +9325,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -8899,7 +9354,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -8928,7 +9383,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -8952,7 +9407,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8960,7 +9415,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -8988,7 +9443,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -9019,7 +9474,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9055,7 +9510,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data/:
     post:
       tags:
       - "tapi-oam"
@@ -9072,7 +9527,7 @@ paths:
         description: "tapi.oam.oamprofile.PmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9080,7 +9535,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -9101,7 +9556,7 @@ paths:
         200:
           description: "tapi.oam.oamprofile.PmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
+            $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -9125,7 +9580,7 @@ paths:
         description: "tapi.oam.oamprofile.PmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9154,8 +9609,238 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-dm-threshold-data/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.common.TimePeriod"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.TimePeriod"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-oam"
+      summary: "removes tapi.common.TimePeriod"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-dm-threshold-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.Eth1DmThresholdData"
@@ -9175,7 +9860,7 @@ paths:
         200:
           description: "tapi.eth.Eth1DmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+            $ref: "#/definitions/tapi.eth.Eth1DmThresholdDataWrapper"
         400:
           description: "Internal error"
     post:
@@ -9199,7 +9884,7 @@ paths:
         description: "tapi.eth.Eth1DmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+          $ref: "#/definitions/tapi.eth.Eth1DmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9228,7 +9913,7 @@ paths:
         description: "tapi.eth.Eth1DmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+          $ref: "#/definitions/tapi.eth.Eth1DmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9257,7 +9942,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-dm-threshold-data/near-end-1-dm-clear-threshold/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-dm-threshold-data/near-end-1-dm-clear-threshold/
   : get:
       tags:
       - "tapi-eth"
@@ -9279,7 +9964,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -9304,7 +9989,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9334,7 +10019,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9364,7 +10049,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-dm-threshold-data/near-end-1-dm-cross-threshold/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-dm-threshold-data/near-end-1-dm-cross-threshold/
   : get:
       tags:
       - "tapi-eth"
@@ -9386,7 +10071,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -9411,7 +10096,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9441,7 +10126,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9471,8 +10156,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-lm-threshold-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-lm-threshold-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.Eth1LmThresholdData"
@@ -9492,7 +10177,7 @@ paths:
         200:
           description: "tapi.eth.Eth1LmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+            $ref: "#/definitions/tapi.eth.Eth1LmThresholdDataWrapper"
         400:
           description: "Internal error"
     post:
@@ -9516,7 +10201,7 @@ paths:
         description: "tapi.eth.Eth1LmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+          $ref: "#/definitions/tapi.eth.Eth1LmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9545,7 +10230,7 @@ paths:
         description: "tapi.eth.Eth1LmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+          $ref: "#/definitions/tapi.eth.Eth1LmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9574,7 +10259,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-lm-threshold-data/near-end-1-lm-clear-threshold/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-lm-threshold-data/near-end-1-lm-clear-threshold/
   : get:
       tags:
       - "tapi-eth"
@@ -9598,7 +10283,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -9625,7 +10310,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9657,7 +10342,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9689,7 +10374,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-lm-threshold-data/near-end-1-lm-cross-threshold/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-lm-threshold-data/near-end-1-lm-cross-threshold/
   : get:
       tags:
       - "tapi-eth"
@@ -9711,7 +10396,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -9736,7 +10421,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9766,7 +10451,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9796,7 +10481,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/:
     get:
       tags:
       - "tapi-eth"
@@ -9817,7 +10502,7 @@ paths:
         200:
           description: "tapi.eth.EthDmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+            $ref: "#/definitions/tapi.eth.EthDmThresholdDataWrapper"
         400:
           description: "Internal error"
     post:
@@ -9841,7 +10526,7 @@ paths:
         description: "tapi.eth.EthDmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthDmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9870,7 +10555,7 @@ paths:
         description: "tapi.eth.EthDmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthDmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -9899,8 +10584,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/bi-dir-dm-clear-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/bi-dir-dm-clear-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
@@ -9921,7 +10606,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -9946,7 +10631,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -9976,7 +10661,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10006,8 +10691,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/bi-dir-dm-cross-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/bi-dir-dm-cross-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
@@ -10028,7 +10713,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10053,7 +10738,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10083,7 +10768,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10113,8 +10798,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/far-end-dm-clear-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/far-end-dm-clear-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
@@ -10135,7 +10820,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10160,7 +10845,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10190,7 +10875,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10220,8 +10905,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/far-end-dm-cross-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/far-end-dm-cross-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
@@ -10242,7 +10927,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10267,7 +10952,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10297,7 +10982,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10327,8 +11012,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/near-end-dm-clear-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/near-end-dm-clear-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
@@ -10349,7 +11034,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10374,7 +11059,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10404,7 +11089,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10434,8 +11119,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/near-end-dm-cross-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/near-end-dm-cross-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
@@ -10456,7 +11141,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10481,7 +11166,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10511,7 +11196,7 @@ paths:
         description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10541,7 +11226,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/:
     get:
       tags:
       - "tapi-eth"
@@ -10562,7 +11247,7 @@ paths:
         200:
           description: "tapi.eth.EthLmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+            $ref: "#/definitions/tapi.eth.EthLmThresholdDataWrapper"
         400:
           description: "Internal error"
     post:
@@ -10586,7 +11271,7 @@ paths:
         description: "tapi.eth.EthLmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthLmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -10615,7 +11300,7 @@ paths:
         description: "tapi.eth.EthLmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthLmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -10644,8 +11329,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/far-end-lm-clear-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/far-end-lm-clear-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
@@ -10668,7 +11353,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10695,7 +11380,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10727,7 +11412,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10759,8 +11444,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/far-end-lm-cross-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/far-end-lm-cross-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
@@ -10781,7 +11466,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10806,7 +11491,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10836,7 +11521,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10866,8 +11551,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/near-end-lm-clear-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/near-end-lm-clear-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
@@ -10890,7 +11575,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -10917,7 +11602,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10949,7 +11634,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -10981,8 +11666,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/near-end-lm-cross-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/near-end-lm-cross-threshold/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
@@ -11003,7 +11688,7 @@ paths:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
@@ -11028,7 +11713,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -11058,7 +11743,7 @@ paths:
         description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -11088,237 +11773,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimePeriod"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimePeriod"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimePeriod"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -11330,7 +11785,7 @@ paths:
         description: "tapi.oam.OamService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -11338,7 +11793,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -11354,7 +11809,7 @@ paths:
         200:
           description: "tapi.oam.OamService"
           schema:
-            $ref: "#/definitions/tapi.oam.OamService"
+            $ref: "#/definitions/tapi.oam.OamServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -11373,7 +11828,7 @@ paths:
         description: "tapi.oam.OamService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -11397,7 +11852,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -11414,7 +11869,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -11422,7 +11877,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -11443,7 +11898,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -11467,7 +11922,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -11496,7 +11951,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
     get:
       tags:
       - "tapi-oam"
@@ -11517,7 +11972,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -11542,7 +11997,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -11572,7 +12027,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -11601,7 +12056,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mep/:
     get:
       tags:
       - "tapi-oam"
@@ -11622,10 +12077,10 @@ paths:
         200:
           description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mip/:
     get:
       tags:
       - "tapi-oam"
@@ -11646,10 +12101,10 @@ paths:
         200:
           description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -11673,7 +12128,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11681,7 +12136,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -11709,7 +12164,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -11740,7 +12195,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11776,7 +12231,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
     get:
       tags:
       - "tapi-oam"
@@ -11797,7 +12252,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -11821,7 +12276,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -11850,7 +12305,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -11879,7 +12334,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/meg/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/meg/:
     get:
       tags:
       - "tapi-oam"
@@ -11895,10 +12350,10 @@ paths:
         200:
           description: "tapi.oam.MegRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MegRef"
+            $ref: "#/definitions/tapi.oam.MegRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -11917,7 +12372,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11925,7 +12380,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -11948,7 +12403,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -11974,7 +12429,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12005,7 +12460,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -12021,7 +12476,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -12040,7 +12495,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -12064,7 +12519,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -12088,7 +12543,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
     get:
       tags:
       - "tapi-path-computation"
@@ -12099,7 +12554,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationContext"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -12114,7 +12569,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -12134,7 +12589,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -12153,7 +12608,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
     post:
       tags:
       - "tapi-path-computation"
@@ -12166,7 +12621,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -12174,7 +12629,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -12190,7 +12645,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationService"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -12210,7 +12665,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -12234,7 +12689,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-path-computation"
@@ -12251,7 +12706,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -12259,7 +12714,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -12280,7 +12735,7 @@ paths:
         200:
           description: "tapi.path.computation.PathServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -12304,7 +12759,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -12333,8 +12788,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.Capacity"
@@ -12354,7 +12809,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -12378,7 +12833,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -12407,7 +12862,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -12436,8 +12891,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.BandwidthProfile"
@@ -12457,7 +12912,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -12481,7 +12936,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -12510,7 +12965,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -12539,7 +12994,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -12560,7 +13015,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -12584,7 +13039,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12613,7 +13068,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12642,7 +13097,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -12663,7 +13118,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -12687,7 +13142,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12716,7 +13171,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12745,7 +13200,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -12766,7 +13221,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -12790,7 +13245,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12819,7 +13274,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12848,7 +13303,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -12869,7 +13324,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -12893,7 +13348,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12922,7 +13377,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12951,246 +13406,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13204,16 +13426,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13226,11 +13449,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13241,8 +13464,9 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13255,11 +13479,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13270,8 +13494,9 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13288,7 +13513,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -13302,12 +13527,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.common.NameAndValue.body-param"
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13315,8 +13545,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -13329,6 +13559,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -13338,7 +13573,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -13354,6 +13589,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -13364,7 +13604,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13385,6 +13625,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -13395,11 +13640,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13407,17 +13652,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathObjectiveFunction"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13425,12 +13675,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -13441,7 +13696,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13449,12 +13704,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -13465,7 +13725,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13473,12 +13733,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -13497,7 +13762,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13505,7 +13770,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -13528,7 +13793,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -13554,7 +13819,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13585,11 +13850,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13599,15 +13864,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13616,12 +13881,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ to list"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -13632,7 +13896,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13641,12 +13905,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -13657,7 +13920,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13670,7 +13933,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -13689,7 +13952,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13697,8 +13960,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -13720,7 +13983,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -13746,7 +14009,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13777,35 +14040,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13815,149 +14054,54 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.RoutingConstraint"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
+      responses:
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -13968,32 +14112,27 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -14001,11 +14140,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14013,54 +14152,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14071,18 +14212,19 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -14090,11 +14232,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14102,17 +14244,41 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14121,11 +14287,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -14136,7 +14302,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14145,11 +14311,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -14160,7 +14326,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14173,30 +14339,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -14204,11 +14353,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -14216,106 +14365,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-    post:
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -14326,25 +14423,32 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
@@ -14352,11 +14456,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -14364,52 +14468,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.RiskCharacteristic"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -14420,17 +14526,18 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
@@ -14438,11 +14545,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14452,15 +14559,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.TopologyConstraint"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14469,11 +14576,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -14484,7 +14591,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14493,11 +14600,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -14508,7 +14615,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14521,243 +14628,190 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.Path"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of link"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LinkRef"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "creates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -14765,42 +14819,52 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePoint"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -14810,13 +14874,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
@@ -14824,171 +14893,141 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
+      - name: "link-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14996,7 +15035,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       - name: "value-name"
@@ -15008,199 +15047,160 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -15211,7 +15211,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -15225,7 +15225,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -15244,7 +15244,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -15263,7 +15263,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -15274,10 +15274,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -15295,10 +15295,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -15314,10 +15314,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -15333,10 +15333,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -15357,10 +15357,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -15381,10 +15381,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -15405,11 +15405,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -15429,10 +15429,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15453,11 +15453,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -15477,11 +15477,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -15501,10 +15501,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -15526,10 +15526,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -15556,11 +15556,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -15586,10 +15586,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -15617,10 +15617,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -15656,10 +15656,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -15680,11 +15680,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -15710,10 +15710,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -15735,11 +15735,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -15759,10 +15759,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -15783,10 +15783,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15807,11 +15807,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -15831,10 +15831,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15855,10 +15855,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -15880,11 +15880,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -15910,10 +15910,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -15936,10 +15936,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -15960,10 +15960,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -15999,10 +15999,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -16023,10 +16023,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -16047,11 +16047,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -16071,10 +16071,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -16095,11 +16095,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -16119,11 +16119,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -16143,10 +16143,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -16168,10 +16168,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -16198,10 +16198,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -16222,11 +16222,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -16252,10 +16252,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -16283,11 +16283,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -16312,11 +16312,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -16341,10 +16341,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -16370,10 +16370,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -16399,10 +16399,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -16428,10 +16428,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -16457,10 +16457,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -16486,10 +16486,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -16516,10 +16516,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -16551,10 +16551,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -16587,10 +16587,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -16639,10 +16639,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -16673,10 +16673,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -16707,10 +16707,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -16741,10 +16741,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -16775,10 +16775,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -16809,10 +16809,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -16843,10 +16843,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -16878,10 +16878,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -16918,10 +16918,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -16958,10 +16958,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -16999,10 +16999,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -17039,10 +17039,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -17078,10 +17078,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -17129,10 +17129,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -17170,10 +17170,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -17216,10 +17216,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -17257,10 +17257,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -17292,10 +17292,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -17326,10 +17326,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -17360,10 +17360,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -17394,10 +17394,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -17428,10 +17428,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -17462,10 +17462,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -17497,10 +17497,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -17532,11 +17532,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -17568,10 +17568,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -17612,10 +17612,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -17658,10 +17658,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -17693,11 +17693,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -17727,10 +17727,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -17773,10 +17773,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -17809,10 +17809,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -17850,10 +17850,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -17886,10 +17886,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -17916,10 +17916,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -17945,10 +17945,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -17974,10 +17974,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18003,10 +18003,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -18032,10 +18032,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18061,10 +18061,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -18091,11 +18091,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -18120,10 +18120,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -18164,10 +18164,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -18193,10 +18193,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -18222,10 +18222,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -18251,10 +18251,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18280,10 +18280,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -18309,10 +18309,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18338,10 +18338,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -18368,11 +18368,83 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePointRef"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
@@ -18397,10 +18469,10 @@ paths:
         200:
           description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -18431,10 +18503,10 @@ paths:
         200:
           description: "tapi.connectivity.ceplist.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -18485,10 +18557,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
@@ -18522,10 +18594,10 @@ paths:
         200:
           description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
       - "tapi-connectivity"
@@ -18556,10 +18628,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -18583,32 +18655,107 @@ paths:
         type: "string"
       - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      - name: "client-node-edge-point-node-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.NodeEdgePointRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
         required: true
         type: "string"
-      - name: "topology-uuid"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of node"
         required: true
         type: "string"
-      - name: "client-node-edge-point-node-uuid"
+      - name: "owned-node-edge-point-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/
   : get:
       tags:
       - "tapi-eth"
@@ -18640,10 +18787,10 @@ paths:
         200:
           description: "tapi.eth.EthConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/
   : get:
       tags:
       - "tapi-eth"
@@ -18674,10 +18821,10 @@ paths:
         200:
           description: "tapi.eth.EthCtpPac"
           schema:
-            $ref: "#/definitions/tapi.eth.EthCtpPac"
+            $ref: "#/definitions/tapi.eth.EthCtpPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/filter-config/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/filter-config/
   : get:
       tags:
       - "tapi-eth"
@@ -18717,10 +18864,10 @@ paths:
         200:
           description: "tapi.eth.ControlFrameFilter"
           schema:
-            $ref: "#/definitions/tapi.eth.ControlFrameFilter"
+            $ref: "#/definitions/tapi.eth.ControlFrameFilterWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-conditioning/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-conditioning/
   : get:
       tags:
       - "tapi-eth"
@@ -18751,10 +18898,10 @@ paths:
         200:
           description: "tapi.eth.TrafficConditioningPac"
           schema:
-            $ref: "#/definitions/tapi.eth.TrafficConditioningPac"
+            $ref: "#/definitions/tapi.eth.TrafficConditioningPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-conditioning/cond-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-conditioning/cond-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
@@ -18798,10 +18945,10 @@ paths:
         200:
           description: "tapi.eth.TrafficConditioningConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.TrafficConditioningConfiguration"
+            $ref: "#/definitions/tapi.eth.TrafficConditioningConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-conditioning/prio-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-conditioning/prio-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
@@ -18839,10 +18986,10 @@ paths:
         200:
           description: "tapi.eth.PriorityConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.PriorityConfiguration"
+            $ref: "#/definitions/tapi.eth.PriorityConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-shaping/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-shaping/
   : get:
       tags:
       - "tapi-eth"
@@ -18873,10 +19020,10 @@ paths:
         200:
           description: "tapi.eth.TrafficShapingPac"
           schema:
-            $ref: "#/definitions/tapi.eth.TrafficShapingPac"
+            $ref: "#/definitions/tapi.eth.TrafficShapingPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-shaping/prio-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-shaping/prio-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
@@ -18914,10 +19061,10 @@ paths:
         200:
           description: "tapi.eth.PriorityConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.PriorityConfiguration"
+            $ref: "#/definitions/tapi.eth.PriorityConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-shaping/queue-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-shaping/queue-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
@@ -18960,10 +19107,10 @@ paths:
         200:
           description: "tapi.eth.QueueConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.QueueConfiguration"
+            $ref: "#/definitions/tapi.eth.QueueConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-term/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-term/
   : get:
       tags:
       - "tapi-eth"
@@ -18994,10 +19141,10 @@ paths:
         200:
           description: "tapi.eth.EthTerminationPac"
           schema:
-            $ref: "#/definitions/tapi.eth.EthTerminationPac"
+            $ref: "#/definitions/tapi.eth.EthTerminationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-term/priority-regenerate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-term/priority-regenerate/
   : get:
       tags:
       - "tapi-eth"
@@ -19029,10 +19176,10 @@ paths:
         200:
           description: "tapi.eth.PriorityMapping"
           schema:
-            $ref: "#/definitions/tapi.eth.PriorityMapping"
+            $ref: "#/definitions/tapi.eth.PriorityMappingWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/ety-term/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/ety-term/
   : get:
       tags:
       - "tapi-eth"
@@ -19063,10 +19210,10 @@ paths:
         200:
           description: "tapi.eth.EtyTerminationPac"
           schema:
-            $ref: "#/definitions/tapi.eth.EtyTerminationPac"
+            $ref: "#/definitions/tapi.eth.EtyTerminationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/
   : get:
       tags:
       - "tapi-oam"
@@ -19097,10 +19244,10 @@ paths:
         200:
           description: "tapi.oam.MepMipList"
           schema:
-            $ref: "#/definitions/tapi.oam.MepMipList"
+            $ref: "#/definitions/tapi.oam.MepMipListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mep={meg-uuid},{mep-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mep={meg-uuid},{mep-local-id}/
   : get:
       tags:
       - "tapi-oam"
@@ -19141,10 +19288,10 @@ paths:
         200:
           description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mip={meg-uuid},{mip-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mip={meg-uuid},{mip-local-id}/
   : get:
       tags:
       - "tapi-oam"
@@ -19185,157 +19332,10 @@ paths:
         200:
           description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
-  : get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.NodeEdgePointRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "service-interface-point-uuid"
-        in: "path"
-        description: "Id of mapped-service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -19362,10 +19362,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -19391,10 +19391,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19420,10 +19420,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19449,10 +19449,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19478,10 +19478,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19507,10 +19507,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19537,10 +19537,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -19562,11 +19562,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -19586,10 +19586,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19610,10 +19610,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19634,11 +19634,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -19658,10 +19658,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19682,10 +19682,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -19707,505 +19707,506 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-job/:
+  /operations/tapi-connectivity:create-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamJob"
-      description: "operates on tapi.oam.CreateOamJob"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamjob.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamjob.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamJob"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service-end-point/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
-      description: "operates on tapi.oam.CreateOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamService"
-      description: "operates on tapi.oam.CreateOamService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectionDetails"
+      description: "operates on tapi.connectivity.GetConnectionDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamservice.Input.body-param"
+        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
+      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
+        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-job/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamJob"
-      description: "operates on tapi.oam.DeleteOamJob"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.deleteoamjob.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
+      - "tapi-connectivity"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service-end-point/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
-      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamService"
-      description: "operates on tapi.oam.DeleteOamService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamservice.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionDetails"
-      description: "operates on tapi.connectivity.GetConnectionDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
-      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
+      - "tapi-notification"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-connectivity"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-meg/:
+  /operations/tapi-oam:create-oam-job/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetMeg"
-      description: "operates on tapi.oam.GetMeg"
+      summary: "operates on tapi.oam.CreateOamJob"
+      description: "operates on tapi.oam.CreateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.oam.getmeg.Input.body-param"
+        name: "tapi.oam.createoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getmeg.Input"
+              $ref: "#/definitions/tapi.oam.createoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetMeg"
+            $ref: "#/definitions/tapi.oam.CreateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-oam:create-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
+      description: "operates on tapi.oam.CreateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-oam:create-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamService"
+      description: "operates on tapi.oam.CreateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.oam.createoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-oam:delete-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamJob"
+      description: "operates on tapi.oam.DeleteOamJob"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
+        name: "tapi.oam.deleteoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-oam:delete-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-oam:delete-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamService"
+      description: "operates on tapi.oam.DeleteOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.deleteoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-oam:get-meg/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetMeg"
+      description: "operates on tapi.oam.GetMeg"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.getmeg.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.getmeg.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.oam.GetMeg"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-job/:
+  /operations/tapi-oam:get-oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -20228,7 +20229,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-end-point/:
+  /operations/tapi-oam:get-oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -20251,7 +20252,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-list/:
+  /operations/tapi-oam:get-oam-service-list/:
     post:
       tags:
       - "tapi-oam"
@@ -20265,7 +20266,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service/:
+  /operations/tapi-oam:get-oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -20288,95 +20289,122 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-oam:update-oam-job/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamJob"
+      description: "operates on tapi.oam.UpdateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.oam.updateoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.oam.UpdateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-oam:update-oam-service-end-point/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-oam:update-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamService"
+      description: "operates on tapi.oam.UpdateOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.oam.UpdateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
-      - "tapi-topology"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
       - "tapi-path-computation"
@@ -20399,136 +20427,108 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-connectivity-service/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-job/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamJob"
-      description: "operates on tapi.oam.UpdateOamJob"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamjob.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamJob"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service-end-point/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
-      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamService"
-      description: "operates on tapi.oam.UpdateOamService"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.updateoamservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
+      - "tapi-topology"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/update-service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
-      responses:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -20584,6 +20584,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -20627,14 +20631,26 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.connectivity.ContextAugmentation4"
-    - $ref: "#/definitions/tapi.notification.ContextAugmentation2"
-    - $ref: "#/definitions/tapi.oam.ContextAugmentation1"
+    - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
+    - $ref: "#/definitions/tapi.oam.ContextAugmentation2"
     - $ref: "#/definitions/tapi.path.computation.ContextAugmentation3"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation5"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -20716,6 +20732,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -20776,6 +20796,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -20828,6 +20856,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.common.TimePeriod"
+  tapi.common.TimeIntervalWrapper:
+    properties:
+      elapsed-time:
+        $ref: "#/definitions/tapi.common.TimeInterval"
   tapi.common.TimePeriod:
     type: "object"
     properties:
@@ -20838,6 +20870,10 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.TimeUnit"
+  tapi.common.TimePeriodWrapper:
+    properties:
+      period:
+        $ref: "#/definitions/tapi.common.TimePeriod"
   tapi.common.TimeRange:
     type: "object"
     properties:
@@ -20847,6 +20883,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.TimeUnit:
     type: "string"
     enum:
@@ -20898,6 +20938,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -21006,6 +21050,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -21013,6 +21061,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -21025,6 +21077,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -21090,6 +21150,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -21179,6 +21243,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+  tapi.connectivity.ConnectivityServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -21186,6 +21258,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+  tapi.connectivity.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityService"
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
@@ -21324,6 +21404,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -21356,6 +21440,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -21461,6 +21553,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -21471,6 +21575,10 @@ definitions:
     - $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
     - $ref: "#/definitions/tapi.eth.ConnectionEndPointAugmentation2"
     - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation1"
+  tapi.connectivity.ceplist.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -21481,6 +21589,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
       description: "none"
+  tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
   tapi.connectivity.createconnectivityservice.Input:
     type: "object"
     properties:
@@ -21619,6 +21731,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute returns the configured bandwidth"
+  tapi.eth.BandwidthReportWrapper:
+    properties:
+      bandwidth-report:
+        $ref: "#/definitions/tapi.eth.BandwidthReport"
   tapi.eth.ColourMode:
     type: "string"
     enum:
@@ -21777,6 +21893,10 @@ definitions:
         type: "boolean"
         description: "Reserved for future standardization."
         default: false
+  tapi.eth.ControlFrameFilterWrapper:
+    properties:
+      filter-config:
+        $ref: "#/definitions/tapi.eth.ControlFrameFilter"
   tapi.eth.CsfConfig:
     type: "string"
     enum:
@@ -21796,6 +21916,10 @@ definitions:
         description: "This attribute contains the near end clear threshold values\
           \ of the delay measurements."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.Eth1DmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-1-dm-threshold-data:
+        $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
   tapi.eth.Eth1LmThresholdData:
     type: "object"
     properties:
@@ -21809,6 +21933,10 @@ definitions:
           \ (see G.7710, section 10.1.7.2: Threshold reporting) and contains the near\
           \ end clear threshold values of the loss measurements."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.Eth1LmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-1-lm-threshold-data:
+        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
   tapi.eth.EthConnectionEndPointSpec:
     type: "object"
     properties:
@@ -21821,6 +21949,10 @@ definitions:
       eth-ctp:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthCtpPac"
+  tapi.eth.EthConnectionEndPointSpecWrapper:
+    properties:
+      tapi-eth:eth-connection-end-point-spec:
+        $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpec"
   tapi.eth.EthCtpPac:
     type: "object"
     properties:
@@ -21958,6 +22090,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.eth.EthCtpPacWrapper:
+    properties:
+      eth-ctp:
+        $ref: "#/definitions/tapi.eth.EthCtpPac"
   tapi.eth.EthDmThresholdData:
     type: "object"
     properties:
@@ -21985,6 +22121,10 @@ definitions:
         description: "This attribute contains the near end clear threshold values\
           \ of the delay measurements."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.EthDmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-dm-threshold-data:
+        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
   tapi.eth.EthLinkTraceJob:
     type: "object"
     properties:
@@ -21999,6 +22139,10 @@ definitions:
       eth-lt-msg:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
+  tapi.eth.EthLinkTraceJobWrapper:
+    properties:
+      tapi-eth:eth-link-trace-job:
+        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
   tapi.eth.EthLinkTraceResultData:
     type: "object"
     properties:
@@ -22010,6 +22154,10 @@ definitions:
           \ Mac Address, the TTL, and TLV."
         items:
           $ref: "#/definitions/tapi.eth.LinkTraceResult"
+  tapi.eth.EthLinkTraceResultDataWrapper:
+    properties:
+      tapi-eth:eth-link-trace-result-data:
+        $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
   tapi.eth.EthLmThresholdData:
     type: "object"
     properties:
@@ -22045,6 +22193,10 @@ definitions:
         description: "This attribute contains the near end cross threshold values\
           \ of the loss measurements."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.EthLmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-lm-threshold-data:
+        $ref: "#/definitions/tapi.eth.EthLmThresholdData"
   tapi.eth.EthLoopbackJob:
     type: "object"
     properties:
@@ -22056,6 +22208,10 @@ definitions:
       eth-lb-msg:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+  tapi.eth.EthLoopbackJobWrapper:
+    properties:
+      tapi-eth:eth-loopback-job:
+        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
   tapi.eth.EthLoopbackResultData:
     type: "object"
     properties:
@@ -22090,6 +22246,10 @@ definitions:
         format: "int32"
         description: "G.8052: This parameter returns the total number of received\
           \ LBR messages, including the out of order LBR frames."
+  tapi.eth.EthLoopbackResultDataWrapper:
+    properties:
+      tapi-eth:eth-loopback-result-data:
+        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
   tapi.eth.EthMegSpec:
     type: "object"
     properties:
@@ -22097,6 +22257,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.eth.EthMegSpecWrapper:
+    properties:
+      tapi-eth:eth-meg-spec:
+        $ref: "#/definitions/tapi.eth.EthMegSpec"
   tapi.eth.EthMepCommon:
     type: "object"
     properties:
@@ -22133,6 +22297,10 @@ definitions:
       mep-mac:
         type: "string"
         description: "This attribute contains the MAC Address of the MEP."
+  tapi.eth.EthMepCommonWrapper:
+    properties:
+      eth-mep-common:
+        $ref: "#/definitions/tapi.eth.EthMepCommon"
   tapi.eth.EthMepSink:
     type: "object"
     properties:
@@ -22196,6 +22364,10 @@ definitions:
         description: "This attribute defines the necessary number of transmitted frames\
           \ to enable the detection of 'bad seconds'. See also section 'Degraded signal\
           \ defect (dDEG)' in G.8021."
+  tapi.eth.EthMepSinkWrapper:
+    properties:
+      eth-mep-sink:
+        $ref: "#/definitions/tapi.eth.EthMepSink"
   tapi.eth.EthMepSource:
     type: "object"
     properties:
@@ -22222,6 +22394,10 @@ definitions:
         description: "This attribute specifies the priority of the APS messages.\r\
           \n                See section 8.1.5    APS insert process in G.8021."
         default: 7
+  tapi.eth.EthMepSourceWrapper:
+    properties:
+      eth-mep-source-pac:
+        $ref: "#/definitions/tapi.eth.EthMepSource"
   tapi.eth.EthMepSpec:
     type: "object"
     properties:
@@ -22234,6 +22410,10 @@ definitions:
       eth-mep-source-pac:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMepSource"
+  tapi.eth.EthMepSpecWrapper:
+    properties:
+      tapi-eth:eth-mep-spec:
+        $ref: "#/definitions/tapi.eth.EthMepSpec"
   tapi.eth.EthMipSpec:
     type: "object"
     properties:
@@ -22245,6 +22425,10 @@ definitions:
         description: "This attribute indicates whether the MIP is a full MIP (true)\
           \ or a down-half MIP (false)."
         default: false
+  tapi.eth.EthMipSpecWrapper:
+    properties:
+      tapi-eth:eth-mip-spec:
+        $ref: "#/definitions/tapi.eth.EthMipSpec"
   tapi.eth.EthOamMsgCommonPac:
     allOf:
     - $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
@@ -22277,6 +22461,10 @@ definitions:
             \ are encountered."
           default: false
       description: "none"
+  tapi.eth.EthOamMsgCommonPacWrapper:
+    properties:
+      eth-lb-msg:
+        $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
   tapi.eth.EthOamOperationCommonPac:
     type: "object"
     properties:
@@ -22290,6 +22478,10 @@ definitions:
         type: "string"
         description: "G.8052: This parameter provides the destination address, i.e.,\
           \ the MAC Address of the target MEP or MIP."
+  tapi.eth.EthOamOperationCommonPacWrapper:
+    properties:
+      eth-lt-msg:
+        $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
   tapi.eth.EthOnDemand1DmPerformanceData:
     type: "object"
     properties:
@@ -22297,6 +22489,10 @@ definitions:
         description: "This attribute contains the results of an on-demand frame delay\
           \ measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+  tapi.eth.EthOnDemand1DmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-1-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
   tapi.eth.EthOnDemand1LmPerformanceData:
     type: "object"
     properties:
@@ -22304,6 +22500,10 @@ definitions:
         description: "This attribute contains the results of an on-demand synthetic\
           \ loss measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+  tapi.eth.EthOnDemand1LmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-1-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
   tapi.eth.EthOnDemand1wayMeasurementJob:
     type: "object"
     properties:
@@ -22313,12 +22513,20 @@ definitions:
       on-demand-control-1way-sink:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
+  tapi.eth.EthOnDemand1wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-on-demand-1way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
   tapi.eth.EthOnDemand2wayMeasurementJob:
     type: "object"
     properties:
       on-demand-control-2way-source:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+  tapi.eth.EthOnDemand2wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-on-demand-2way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
   tapi.eth.EthOnDemandDmPerformanceData:
     type: "object"
     properties:
@@ -22330,6 +22538,10 @@ definitions:
         description: "This attribute contains the results of an on-demand frame delay\
           \ measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+  tapi.eth.EthOnDemandDmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
   tapi.eth.EthOnDemandLmPerformanceData:
     type: "object"
     properties:
@@ -22341,6 +22553,10 @@ definitions:
         description: "This attribute contains the results of an on-demand synthetic\
           \ loss measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+  tapi.eth.EthOnDemandLmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
   tapi.eth.EthOnDemandMeasurementJobControlSink:
     type: "object"
     properties:
@@ -22366,6 +22582,10 @@ definitions:
           \ be unique at least within the context of any measurement type for the\
           \ MEG and initiating MEP.\r\n                range of type : 0..(2^32) -\
           \ 1"
+  tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper:
+    properties:
+      on-demand-control-1way-sink:
+        $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
   tapi.eth.EthOnDemandMeasurementJobControlSource:
     type: "object"
     properties:
@@ -22430,6 +22650,10 @@ definitions:
           \ intervals. Note that the value 0 means a degenerated measurement interval\
           \ with a single OAM message and the report is sent as immediately as possible.\r\
           \n                range of type : Non-negative"
+  tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper:
+    properties:
+      on-demand-control-1way-source:
+        $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
   tapi.eth.EthProActive1DmPerformanceData:
     type: "object"
     properties:
@@ -22437,6 +22661,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.EthProActive1DmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-1-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
   tapi.eth.EthProActive1LmPerformanceData:
     type: "object"
     properties:
@@ -22444,6 +22672,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.EthProActive1LmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-1-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
   tapi.eth.EthProActive1wayMeasurementJob:
     type: "object"
     properties:
@@ -22453,12 +22685,20 @@ definitions:
       pro-active-control-1way-sink:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
+  tapi.eth.EthProActive1wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-pro-active-1way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
   tapi.eth.EthProActive2wayMeasurementJob:
     type: "object"
     properties:
       pro-active-control-2way-source:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+  tapi.eth.EthProActive2wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-pro-active-2way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
   tapi.eth.EthProActiveDmPerformanceData:
     type: "object"
     properties:
@@ -22474,6 +22714,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.EthProActiveDmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
   tapi.eth.EthProActiveLmPerformanceData:
     type: "object"
     properties:
@@ -22491,6 +22735,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.EthProActiveLmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
   tapi.eth.EthProActiveMeasurementJobControlSink:
     type: "object"
     properties:
@@ -22515,6 +22763,10 @@ definitions:
         description: "This attribute identifies the state of the measurement job.\
           \ If set to TRUE, the MEP performs proactive Performance Measurement."
         default: true
+  tapi.eth.EthProActiveMeasurementJobControlSinkWrapper:
+    properties:
+      pro-active-control-1way-sink:
+        $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
   tapi.eth.EthProActiveMeasurementJobControlSource:
     type: "object"
     properties:
@@ -22563,6 +22815,10 @@ definitions:
         description: "This attribute identifies the state of the measurement job.\
           \ If set to TRUE, the MEP performs proactive Performance Measurement."
         default: true
+  tapi.eth.EthProActiveMeasurementJobControlSourceWrapper:
+    properties:
+      pro-active-control-1way-source:
+        $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
   tapi.eth.EthTerminationPac:
     type: "object"
     properties:
@@ -22607,12 +22863,20 @@ definitions:
         description: "This attribute models the ETHx/ETH-m _A_Sk_MI_P_Regenerate information\
           \ defined in G.8021."
         $ref: "#/definitions/tapi.eth.PriorityMapping"
+  tapi.eth.EthTerminationPacWrapper:
+    properties:
+      eth-term:
+        $ref: "#/definitions/tapi.eth.EthTerminationPac"
   tapi.eth.EthTestJob:
     type: "object"
     properties:
       eth-test-msg:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+  tapi.eth.EthTestJobWrapper:
+    properties:
+      tapi-eth:eth-test-job:
+        $ref: "#/definitions/tapi.eth.EthTestJob"
   tapi.eth.EthTestResultData:
     type: "object"
     properties:
@@ -22621,6 +22885,10 @@ definitions:
         format: "int32"
         description: "G.8052: This parameter returns the total number of sent TST\
           \ frames."
+  tapi.eth.EthTestResultDataWrapper:
+    properties:
+      tapi-eth:eth-test-result-data:
+        $ref: "#/definitions/tapi.eth.EthTestResultData"
   tapi.eth.EtyPhyType:
     type: "string"
     enum:
@@ -22661,6 +22929,10 @@ definitions:
           \ be supported at the ETY trail termination. See IEEE 802.3 clause 30.3.2.1.3."
         items:
           $ref: "#/definitions/tapi.eth.EtyPhyType"
+  tapi.eth.EtyTerminationPacWrapper:
+    properties:
+      ety-term:
+        $ref: "#/definitions/tapi.eth.EtyTerminationPac"
   tapi.eth.FrameType:
     type: "string"
     enum:
@@ -22684,6 +22956,10 @@ definitions:
         type: "string"
         description: "G.8052: This attribute contains the source MAC Address of an\
           \ individual LTR frame result."
+  tapi.eth.LinkTraceResultWrapper:
+    properties:
+      result-list:
+        $ref: "#/definitions/tapi.eth.LinkTraceResult"
   tapi.eth.MegAugmentation1:
     type: "object"
     properties:
@@ -22722,18 +22998,18 @@ definitions:
   tapi.eth.OamJobAugmentation1:
     type: "object"
     properties:
-      eth-on-demand-2way-measurement-job:
+      eth-link-trace-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation2:
     type: "object"
     properties:
-      eth-test-job:
+      eth-on-demand-2way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthTestJob"
+        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -22749,36 +23025,36 @@ definitions:
   tapi.eth.OamJobAugmentation4:
     type: "object"
     properties:
-      eth-loopback-job:
+      eth-pro-active-2way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+        $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation5:
     type: "object"
     properties:
-      eth-link-trace-job:
+      eth-test-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+        $ref: "#/definitions/tapi.eth.EthTestJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation6:
     type: "object"
     properties:
-      eth-on-demand-1way-measurement-job:
+      eth-loopback-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation7:
     type: "object"
     properties:
-      eth-pro-active-2way-measurement-job:
+      eth-on-demand-1way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -22824,6 +23100,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.eth.OnDemandDmPerformanceParametersWrapper:
+    properties:
+      on-demand-near-end-1-dm-parameters:
+        $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
   tapi.eth.OnDemandLmPerformanceParameters:
     type: "object"
     properties:
@@ -22840,6 +23120,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute contains the total number of frames lost."
+  tapi.eth.OnDemandLmPerformanceParametersWrapper:
+    properties:
+      on-demand-near-end-1-lm-parameters:
+        $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
   tapi.eth.PcpCoding:
     type: "string"
     enum:
@@ -22851,207 +23135,207 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation1:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      eth-pro-active-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation10:
     type: "object"
     properties:
-      eth-test-result-data:
+      eth-pro-active-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthTestResultData"
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation11:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      eth-test-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthTestResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation2:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      eth-on-demand-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation3:
     type: "object"
     properties:
-      eth-link-trace-result-data:
+      eth-pro-active-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation4:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      eth-link-trace-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation5:
     type: "object"
     properties:
-      eth-loopback-result-data:
+      eth-on-demand-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation6:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      eth-pro-active-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation7:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      eth-on-demand-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation8:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      eth-loopback-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation9:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      eth-on-demand-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation1:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      eth-pro-active-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      eth-on-demand-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation3:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      eth-pro-active-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation4:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      eth-on-demand-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation5:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      eth-on-demand-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation6:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      eth-pro-active-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      eth-on-demand-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation8:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      eth-pro-active-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation1:
     type: "object"
     properties:
-      eth-1-lm-threshold-data:
+      eth-lm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+        $ref: "#/definitions/tapi.eth.EthLmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation2:
     type: "object"
     properties:
-      eth-1-dm-threshold-data:
+      eth-dm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation3:
     type: "object"
     properties:
-      eth-dm-threshold-data:
+      eth-1-dm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+        $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation4:
     type: "object"
     properties:
-      eth-lm-threshold-data:
+      eth-1-lm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -23066,6 +23350,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.eth.PriorityConfigurationWrapper:
+    properties:
+      prio-config-list:
+        $ref: "#/definitions/tapi.eth.PriorityConfiguration"
   tapi.eth.PriorityMapping:
     type: "object"
     properties:
@@ -23116,6 +23404,10 @@ definitions:
         description: "This attribute defines the new priority value for the old priority\
           \ value 7."
         default: 7
+  tapi.eth.PriorityMappingWrapper:
+    properties:
+      priority-regenerate:
+        $ref: "#/definitions/tapi.eth.PriorityMapping"
   tapi.eth.QueueConfiguration:
     type: "object"
     properties:
@@ -23131,6 +23423,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute defines the depth of the queue in bytes."
+  tapi.eth.QueueConfigurationWrapper:
+    properties:
+      queue-config-list:
+        $ref: "#/definitions/tapi.eth.QueueConfiguration"
   tapi.eth.RepetitionPeriod:
     type: "string"
     enum:
@@ -23174,6 +23470,10 @@ definitions:
         format: "int32"
         description: "This attribute contains the average frame delay variation measured\
           \ in units of ns (nano second, 1x10e-9 seconds)."
+  tapi.eth.StatisticalDmPerformanceParametersWrapper:
+    properties:
+      pro-active-near-end-1-dm-parameters:
+        $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
   tapi.eth.StatisticalLmPerformanceParameters:
     type: "object"
     properties:
@@ -23204,6 +23504,10 @@ definitions:
         description: "This attribute contains the minimum frame loss ratio calculated\
           \ over a period of time.\r\n                The accuracy of the value is\
           \ for further study."
+  tapi.eth.StatisticalLmPerformanceParametersWrapper:
+    properties:
+      pro-active-near-end-1-lm-parameters:
+        $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
   tapi.eth.TrafficConditioningConfiguration:
     type: "object"
     properties:
@@ -23234,6 +23538,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute indicates the Excess Information Rate in bits/s."
+  tapi.eth.TrafficConditioningConfigurationWrapper:
+    properties:
+      cond-config-list:
+        $ref: "#/definitions/tapi.eth.TrafficConditioningConfiguration"
   tapi.eth.TrafficConditioningPac:
     type: "object"
     properties:
@@ -23264,6 +23572,10 @@ definitions:
           \ color-blind and color-aware."
         items:
           $ref: "#/definitions/tapi.eth.TrafficConditioningConfiguration"
+  tapi.eth.TrafficConditioningPacWrapper:
+    properties:
+      traffic-conditioning:
+        $ref: "#/definitions/tapi.eth.TrafficConditioningPac"
   tapi.eth.TrafficShapingPac:
     type: "object"
     properties:
@@ -23303,6 +23615,10 @@ definitions:
           \ queue."
         items:
           $ref: "#/definitions/tapi.eth.PriorityConfiguration"
+  tapi.eth.TrafficShapingPacWrapper:
+    properties:
+      traffic-shaping:
+        $ref: "#/definitions/tapi.eth.TrafficShapingPac"
   tapi.eth.VlanType:
     type: "string"
     enum:
@@ -23325,7 +23641,11 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
-  tapi.notification.ContextAugmentation2:
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
+  tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
       notification-context:
@@ -23376,6 +23696,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -23448,6 +23772,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -23461,6 +23789,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -23491,6 +23823,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -23499,6 +23835,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -23587,6 +23927,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -23619,6 +23963,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -23734,7 +24082,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-oam"
       namespace: "urn:onf:otcc:yang:tapi-oam"
-  tapi.oam.ContextAugmentation1:
+  tapi.oam.ContextAugmentation2:
     type: "object"
     properties:
       oam-context:
@@ -23823,6 +24171,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid"
+  tapi.oam.MegRefWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.MegRef"
   tapi.oam.Mep:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -23857,6 +24209,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepMipListWrapper:
+    properties:
+      tapi-oam:mep-mip-list:
+        $ref: "#/definitions/tapi.oam.MepMipList"
   tapi.oam.MepRef:
     allOf:
     - $ref: "#/definitions/tapi.oam.MegRef"
@@ -23867,6 +24223,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MepRefWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.MepRef"
   tapi.oam.Mip:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -23886,6 +24246,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MipRefWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.MipRef"
   tapi.oam.OamConstraint:
     type: "object"
     properties:
@@ -23955,6 +24319,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid"
+  tapi.oam.OamProfileRefWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfileRef"
   tapi.oam.OamService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -24023,6 +24391,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id"
       description: "none"
+  tapi.oam.OamServiceEndPointRefWrapper:
+    properties:
+      oam-service-end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+  tapi.oam.OamServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
   tapi.oam.OamServiceRef:
     type: "object"
     properties:
@@ -24030,6 +24406,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid"
+  tapi.oam.OamServiceWrapper:
+    properties:
+      oam-service:
+        $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.PmBinData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -24039,6 +24419,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmBinDataWrapper:
+    properties:
+      pm-bin-data:
+        $ref: "#/definitions/tapi.oam.PmBinData"
   tapi.oam.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -24148,6 +24532,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.oam.oamcontext.Meg"
       description: "Augments the base TAPI Context with OamService information"
+  tapi.oam.context.OamContextWrapper:
+    properties:
+      tapi-oam:oam-context:
+        $ref: "#/definitions/tapi.oam.context.OamContext"
   tapi.oam.createoamjob.Input:
     type: "object"
     properties:
@@ -24313,10 +24701,18 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.eth.MepAugmentation1"
     - $ref: "#/definitions/tapi.oam.Mep"
+  tapi.oam.meg.MepWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.meg.Mep"
   tapi.oam.meg.Mip:
     allOf:
     - $ref: "#/definitions/tapi.eth.MipAugmentation1"
     - $ref: "#/definitions/tapi.oam.Mip"
+  tapi.oam.meg.MipWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.meg.Mip"
   tapi.oam.oamcontext.Meg:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -24351,6 +24747,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "none"
+  tapi.oam.oamcontext.MegWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.oamcontext.Meg"
   tapi.oam.oamcontext.OamJob:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -24391,6 +24791,10 @@ definitions:
           type: "string"
           description: "none"
       description: "none"
+  tapi.oam.oamcontext.OamJobWrapper:
+    properties:
+      oam-job:
+        $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
   tapi.oam.oamcontext.OamProfile:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -24407,6 +24811,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.oam.PmBinData"
       description: "none"
+  tapi.oam.oamcontext.OamProfileWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
   tapi.oam.oamjob.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -24461,6 +24869,10 @@ definitions:
         \ example, typically at least\r\n                one 15min and\r\n       \
         \         one 24hr;\r\n                optionally one additional configurable\
         \ (< 15min)"
+  tapi.oam.oamjob.PmCurrentDataWrapper:
+    properties:
+      pm-current-data:
+        $ref: "#/definitions/tapi.oam.oamjob.PmCurrentData"
   tapi.oam.oamprofile.PmThresholdData:
     allOf:
     - $ref: "#/definitions/tapi.eth.PmThresholdDataAugmentation1"
@@ -24468,6 +24880,10 @@ definitions:
     - $ref: "#/definitions/tapi.eth.PmThresholdDataAugmentation3"
     - $ref: "#/definitions/tapi.eth.PmThresholdDataAugmentation4"
     - $ref: "#/definitions/tapi.oam.PmThresholdData"
+  tapi.oam.oamprofile.PmThresholdDataWrapper:
+    properties:
+      pm-threshold-data:
+        $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
   tapi.oam.pmcurrentdata.PmHistoryData:
     allOf:
     - $ref: "#/definitions/tapi.eth.PmHistoryDataAugmentation1"
@@ -24479,6 +24895,10 @@ definitions:
     - $ref: "#/definitions/tapi.eth.PmHistoryDataAugmentation7"
     - $ref: "#/definitions/tapi.eth.PmHistoryDataAugmentation8"
     - $ref: "#/definitions/tapi.oam.PmHistoryData"
+  tapi.oam.pmcurrentdata.PmHistoryDataWrapper:
+    properties:
+      pm-history-data:
+        $ref: "#/definitions/tapi.oam.pmcurrentdata.PmHistoryData"
   tapi.oam.updateoamjob.Input:
     type: "object"
     properties:
@@ -24609,6 +25029,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -24637,6 +25061,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -24658,6 +25086,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -24667,6 +25099,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -24674,6 +25110,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -24710,6 +25150,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -24762,6 +25210,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -24814,6 +25266,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -24825,6 +25281,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -24894,6 +25354,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
@@ -24917,6 +25381,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -24973,6 +25441,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -24999,6 +25471,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -25053,6 +25529,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -25064,6 +25548,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -25153,6 +25641,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -25208,6 +25700,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -25230,6 +25730,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -25250,6 +25754,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -25275,6 +25783,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -25389,6 +25901,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -25408,6 +25924,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -25445,6 +25965,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -25452,6 +25976,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -25517,6 +26049,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -25598,6 +26134,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation1"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -25632,3 +26172,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
diff --git a/OAS/tapi-notification@2020-04-23.yaml b/OAS/tapi-notification@2020-06-16.yaml
similarity index 87%
rename from OAS/tapi-notification@2020-04-23.yaml
rename to OAS/tapi-notification@2020-06-16.yaml
index e715a5eb..3d1e76ae 100644
--- a/OAS/tapi-notification@2020-04-23.yaml
+++ b/OAS/tapi-notification@2020-06-16.yaml
@@ -35,7 +35,7 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
+  version: "2.1.3"
   title: "tapi-notification,tapi-common API"
 host: "localhost:1234"
 consumes:
@@ -43,7 +43,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -54,7 +54,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -68,7 +68,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -87,7 +87,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -106,7 +106,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/name/:
     post:
       tags:
       - "tapi-common"
@@ -120,7 +120,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -128,7 +128,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -146,7 +146,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -167,7 +167,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -193,32 +193,19 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.notification.NotificationContext"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -226,18 +213,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePoint"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -247,100 +258,158 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationSubscriptionService"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
     post:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -348,7 +417,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
@@ -356,7 +425,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -364,10 +433,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -375,7 +444,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -387,12 +456,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -400,7 +469,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -413,7 +482,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -423,7 +492,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -431,7 +500,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -444,288 +513,248 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
-        required: true
-        type: "string"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+    post:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
-      description: "none"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
-        200:
-          description: "tapi.notification.SubscriptionFilter"
-          schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NotificationSubscriptionService"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -734,11 +763,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -749,7 +779,7 @@ paths:
     delete:
       tags:
       - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -762,7 +792,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -781,7 +811,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -789,7 +819,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -812,7 +842,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -838,7 +868,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -869,378 +899,328 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      summary: "returns tapi.notification.NotificationChannel"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "none"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of additional-info"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.notification.AlarmInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of target-object-name"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1248,7 +1228,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
@@ -1256,7 +1236,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1264,10 +1244,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1275,7 +1255,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1287,12 +1267,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1300,7 +1280,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1313,7 +1293,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1323,7 +1303,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1331,7 +1311,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1344,285 +1324,324 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-common"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-common:update-service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
       - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
       - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
       - "tapi-notification"
-      parameters: []
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
+      parameters:
+      - in: "body"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
       - "tapi-notification"
@@ -1636,7 +1655,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
       - "tapi-notification"
@@ -1659,25 +1678,6 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
-      responses:
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
 definitions:
   tapi.common.AdminStatePac:
     type: "object"
@@ -1729,6 +1729,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -1772,10 +1776,22 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.GetServiceInterfacePointDetails:
     type: "object"
     properties:
@@ -1843,6 +1859,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -1879,6 +1899,10 @@ definitions:
         \ termination and adaptation functions of one or more transport layers. \r\
         \n            The structure of LTP supports all transport protocols including\
         \ circuit and packet forms."
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -1938,6 +1962,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -1989,6 +2017,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -2061,6 +2093,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -2074,6 +2110,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -2104,6 +2144,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -2112,6 +2156,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -2200,6 +2248,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -2232,6 +2284,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
diff --git a/OAS/tapi-oam@2020-04-23.yaml b/OAS/tapi-oam@2020-04-23.yaml
index 000bea82..55c525c6 100644
--- a/OAS/tapi-oam@2020-04-23.yaml
+++ b/OAS/tapi-oam@2020-04-23.yaml
@@ -1,24 +1,24 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Connectivity Model definitions.\r\
-    \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI OAM Model definitions.\r\
+    \ the Apache License 2.0,\r\n        This module contains TAPI OAM Model definitions.\r\
     \n        Source: TapiOam.uml\r\n        - The TAPI YANG models included in this\
     \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
     \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
@@ -35,41 +35,41 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
-    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -103,8 +103,8 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
-  title: "tapi-connectivity,tapi-oam,tapi-topology,tapi-notification,tapi-common,tapi-path-computation\
+  version: "2.1.3"
+  title: "tapi-notification,tapi-oam,tapi-connectivity,tapi-topology,tapi-common,tapi-path-computation\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -112,7 +112,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -123,7 +123,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -137,7 +137,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -156,7 +156,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -175,32 +175,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -208,18 +197,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -229,183 +246,708 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityContext"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Connection"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of lower-connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Route"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
@@ -437,10 +979,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -468,10 +1010,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
     get:
       tags:
       - "tapi-connectivity"
@@ -492,11 +1034,11 @@ paths:
         200:
           description: "tapi.connectivity.ResilienceRoute"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -523,11 +1065,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LinkRef"
@@ -552,10 +1094,10 @@ paths:
         200:
           description: "tapi.topology.LinkRef"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -576,11 +1118,11 @@ paths:
         200:
           description: "tapi.connectivity.SwitchControl"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -607,11 +1149,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.ResilienceType"
@@ -631,10 +1173,10 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -665,11 +1207,11 @@ paths:
         200:
           description: "tapi.connectivity.SwitchControlRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.Switch"
@@ -694,11 +1236,11 @@ paths:
         200:
           description: "tapi.connectivity.Switch"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -730,10 +1272,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -779,10 +1321,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -818,10 +1360,10 @@ paths:
         200:
           description: "tapi.connectivity.RouteRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
     post:
       tags:
       - "tapi-connectivity"
@@ -833,7 +1375,7 @@ paths:
         description: "tapi.connectivity.ConnectivityService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -841,7 +1383,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -857,7 +1399,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityService"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -876,7 +1418,7 @@ paths:
         description: "tapi.connectivity.ConnectivityService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -900,7 +1442,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -921,10 +1463,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
     get:
       tags:
       - "tapi-connectivity"
@@ -940,7 +1482,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -959,7 +1501,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -983,7 +1525,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1007,7 +1549,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1025,7 +1567,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1033,7 +1575,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1055,7 +1597,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -1080,7 +1622,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1110,7 +1652,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1127,7 +1669,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1135,8 +1677,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceRef"
@@ -1156,7 +1698,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -1180,7 +1722,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1209,7 +1751,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1227,7 +1769,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1235,7 +1777,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1256,7 +1798,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -1281,7 +1823,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1310,7 +1852,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1331,7 +1873,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -1355,7 +1897,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1384,7 +1926,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1413,8 +1955,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -1434,7 +1976,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -1458,7 +2000,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1487,7 +2029,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1516,7 +2058,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1537,7 +2079,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1561,7 +2103,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1590,7 +2132,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1619,7 +2161,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1640,7 +2182,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1664,7 +2206,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1693,7 +2235,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1722,8 +2264,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1743,7 +2285,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1767,7 +2309,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1796,7 +2338,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1825,7 +2367,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1846,7 +2388,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1870,7 +2412,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1899,7 +2441,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1928,8 +2470,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1950,7 +2492,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1975,7 +2517,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2005,7 +2547,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2035,7 +2577,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -2076,10 +2618,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2103,7 +2645,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2111,8 +2653,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -2139,7 +2681,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2170,7 +2712,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2206,8 +2748,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2227,7 +2769,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2252,7 +2794,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2282,7 +2824,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2311,8 +2853,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2332,7 +2874,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2357,7 +2899,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2387,7 +2929,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2416,8 +2958,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
@@ -2437,7 +2979,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2462,7 +3004,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2492,7 +3034,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2521,8 +3063,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -2542,7 +3084,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2566,7 +3108,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2595,7 +3137,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2624,7 +3166,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2642,7 +3184,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2650,8 +3192,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -2672,7 +3214,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -2697,7 +3239,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2727,7 +3269,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2743,7 +3285,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2762,7 +3304,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2786,7 +3328,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2810,7 +3352,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2826,7 +3368,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2845,7 +3387,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2869,7 +3411,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2893,7 +3435,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
     get:
       tags:
       - "tapi-connectivity"
@@ -2909,7 +3451,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -2928,7 +3470,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2952,7 +3494,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -2976,7 +3518,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2995,7 +3537,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3003,7 +3545,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3026,7 +3568,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -3052,7 +3594,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3083,7 +3625,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3099,7 +3641,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3118,7 +3660,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3142,7 +3684,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3166,8 +3708,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -3182,7 +3724,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -3201,7 +3743,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3225,7 +3767,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3249,8 +3791,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3265,7 +3807,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3284,7 +3826,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3308,7 +3850,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3332,8 +3874,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3348,7 +3890,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3367,7 +3909,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3391,7 +3933,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3415,8 +3957,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3431,7 +3973,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3450,7 +3992,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3474,7 +4016,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3498,8 +4040,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3514,7 +4056,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3533,7 +4075,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3557,7 +4099,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3581,7 +4123,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3598,7 +4140,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3618,7 +4160,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3643,7 +4185,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3668,7 +4210,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3684,7 +4226,7 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
     post:
@@ -3703,7 +4245,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3727,7 +4269,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3751,7 +4293,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3768,7 +4310,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3776,8 +4318,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -3797,7 +4339,7 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -3821,7 +4363,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3850,7 +4392,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3866,7 +4408,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -3885,7 +4427,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3909,7 +4451,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -3933,94 +4475,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/name={value-name}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
@@ -4031,7 +4486,7 @@ paths:
         200:
           description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4045,7 +4500,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4064,7 +4519,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4083,7 +4538,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
@@ -4096,7 +4551,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4104,7 +4559,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4120,7 +4575,7 @@ paths:
         200:
           description: "tapi.notification.NotificationSubscriptionService"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -4140,7 +4595,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4164,7 +4619,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4183,7 +4638,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4191,7 +4646,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4214,7 +4669,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4240,7 +4695,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4271,7 +4726,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
@@ -4287,11 +4742,11 @@ paths:
         200:
           description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4313,10 +4768,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4337,11 +4792,11 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4366,11 +4821,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.AlarmInfo"
@@ -4390,11 +4845,11 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.NameAndValueChange"
@@ -4419,11 +4874,11 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4450,11 +4905,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4479,11 +4934,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.TcaInfo"
@@ -4503,10 +4958,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
       - "tapi-notification"
@@ -4522,7 +4977,7 @@ paths:
         200:
           description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
@@ -4541,7 +4996,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4565,7 +5020,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -4589,7 +5044,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4608,7 +5063,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4616,8 +5071,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4639,7 +5094,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4665,7 +5120,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4696,7 +5151,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4712,10 +5167,10 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4736,10 +5191,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
       - "tapi-notification"
@@ -4755,10 +5210,10 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4779,10 +5234,10 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4805,10 +5260,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4829,10 +5284,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
       - "tapi-notification"
@@ -4848,10 +5303,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/:
+  /data/tapi-common:context/tapi-oam:oam-context/:
     get:
       tags:
       - "tapi-oam"
@@ -4862,7 +5317,7 @@ paths:
         200:
           description: "tapi.oam.OamContext"
           schema:
-            $ref: "#/definitions/tapi.oam.OamContext"
+            $ref: "#/definitions/tapi.oam.OamContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4876,7 +5331,7 @@ paths:
         description: "tapi.oam.OamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4895,7 +5350,7 @@ paths:
         description: "tapi.oam.OamContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4914,7 +5369,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/meg={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -4930,10 +5385,10 @@ paths:
         200:
           description: "tapi.oam.Meg"
           schema:
-            $ref: "#/definitions/tapi.oam.Meg"
+            $ref: "#/definitions/tapi.oam.MegWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -4957,10 +5412,10 @@ paths:
         200:
           description: "tapi.oam.Mep"
           schema:
-            $ref: "#/definitions/tapi.oam.Mep"
+            $ref: "#/definitions/tapi.oam.MepWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -4988,10 +5443,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -5012,10 +5467,10 @@ paths:
         200:
           description: "tapi.oam.Mip"
           schema:
-            $ref: "#/definitions/tapi.oam.Mip"
+            $ref: "#/definitions/tapi.oam.MipWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5043,10 +5498,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5069,10 +5524,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -5084,7 +5539,7 @@ paths:
         description: "tapi.oam.OamJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5092,7 +5547,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5108,7 +5563,7 @@ paths:
         200:
           description: "tapi.oam.OamJob"
           schema:
-            $ref: "#/definitions/tapi.oam.OamJob"
+            $ref: "#/definitions/tapi.oam.OamJobWrapper"
         400:
           description: "Internal error"
     put:
@@ -5127,7 +5582,7 @@ paths:
         description: "tapi.oam.OamJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5151,7 +5606,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -5170,7 +5625,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5178,7 +5633,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5201,7 +5656,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5227,7 +5682,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5258,7 +5713,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -5274,7 +5729,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -5293,7 +5748,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5317,7 +5772,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5341,7 +5796,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -5358,7 +5813,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5366,8 +5821,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.OamServiceEndPointRef"
@@ -5392,7 +5847,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -5421,7 +5876,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -5455,7 +5910,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -5480,10 +5935,10 @@ paths:
         200:
           description: "tapi.oam.PmCurrentData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmCurrentData"
+            $ref: "#/definitions/tapi.oam.PmCurrentDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
     get:
       tags:
       - "tapi-oam"
@@ -5504,10 +5959,10 @@ paths:
         200:
           description: "tapi.common.TimeInterval"
           schema:
-            $ref: "#/definitions/tapi.common.TimeInterval"
+            $ref: "#/definitions/tapi.common.TimeIntervalWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
     get:
       tags:
       - "tapi-oam"
@@ -5533,10 +5988,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -5557,10 +6012,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5588,11 +6043,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.PmHistoryData"
@@ -5620,10 +6075,10 @@ paths:
         200:
           description: "tapi.oam.PmHistoryData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmHistoryData"
+            $ref: "#/definitions/tapi.oam.PmHistoryDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
   : get:
       tags:
       - "tapi-oam"
@@ -5649,10 +6104,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-oam"
@@ -5685,10 +6140,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/schedule/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/schedule/:
     get:
       tags:
       - "tapi-oam"
@@ -5704,7 +6159,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -5723,7 +6178,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -5747,7 +6202,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -5771,7 +6226,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile/:
     post:
       tags:
       - "tapi-oam"
@@ -5783,7 +6238,7 @@ paths:
         description: "tapi.oam.OamProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -5791,7 +6246,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5807,7 +6262,7 @@ paths:
         200:
           description: "tapi.oam.OamProfile"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfile"
+            $ref: "#/definitions/tapi.oam.OamProfileWrapper"
         400:
           description: "Internal error"
     put:
@@ -5826,7 +6281,7 @@ paths:
         description: "tapi.oam.OamProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -5850,7 +6305,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -5869,7 +6324,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5877,7 +6332,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5900,7 +6355,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5926,7 +6381,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5957,7 +6412,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data/:
     post:
       tags:
       - "tapi-oam"
@@ -5974,7 +6429,7 @@ paths:
         description: "tapi.oam.PmBinData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -5982,7 +6437,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6003,7 +6458,7 @@ paths:
         200:
           description: "tapi.oam.PmBinData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmBinData"
+            $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -6027,7 +6482,7 @@ paths:
         description: "tapi.oam.PmBinData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6056,7 +6511,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -6077,7 +6532,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -6101,7 +6556,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6130,7 +6585,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6159,7 +6614,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6183,7 +6638,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6191,7 +6646,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6219,7 +6674,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6250,7 +6705,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6286,7 +6741,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data/:
     post:
       tags:
       - "tapi-oam"
@@ -6303,7 +6758,7 @@ paths:
         description: "tapi.oam.PmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6311,7 +6766,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6332,7 +6787,7 @@ paths:
         200:
           description: "tapi.oam.PmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmThresholdData"
+            $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -6356,7 +6811,7 @@ paths:
         description: "tapi.oam.PmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6385,7 +6840,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -6406,7 +6861,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -6430,7 +6885,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6459,7 +6914,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6488,7 +6943,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6512,7 +6967,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6520,7 +6975,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6548,7 +7003,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6579,7 +7034,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6615,7 +7070,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -6627,7 +7082,7 @@ paths:
         description: "tapi.oam.OamService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -6635,7 +7090,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -6651,7 +7106,7 @@ paths:
         200:
           description: "tapi.oam.OamService"
           schema:
-            $ref: "#/definitions/tapi.oam.OamService"
+            $ref: "#/definitions/tapi.oam.OamServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -6670,7 +7125,7 @@ paths:
         description: "tapi.oam.OamService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -6694,7 +7149,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -6711,7 +7166,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -6719,7 +7174,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6740,7 +7195,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -6764,7 +7219,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -6793,7 +7248,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
     get:
       tags:
       - "tapi-oam"
@@ -6814,7 +7269,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -6839,7 +7294,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6869,7 +7324,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6898,7 +7353,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mep/:
     get:
       tags:
       - "tapi-oam"
@@ -6919,10 +7374,10 @@ paths:
         200:
           description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mip/:
     get:
       tags:
       - "tapi-oam"
@@ -6943,10 +7398,10 @@ paths:
         200:
           description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6970,7 +7425,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6978,7 +7433,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7006,7 +7461,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7037,7 +7492,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7073,7 +7528,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
     get:
       tags:
       - "tapi-oam"
@@ -7094,7 +7549,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -7118,7 +7573,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7147,7 +7602,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7176,7 +7631,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/meg/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/meg/:
     get:
       tags:
       - "tapi-oam"
@@ -7192,10 +7647,10 @@ paths:
         200:
           description: "tapi.oam.MegRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MegRef"
+            $ref: "#/definitions/tapi.oam.MegRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -7214,7 +7669,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7222,7 +7677,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7245,7 +7700,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7271,7 +7726,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7302,7 +7757,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -7318,7 +7773,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -7337,7 +7792,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7361,7 +7816,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7385,7 +7840,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
     get:
       tags:
       - "tapi-path-computation"
@@ -7396,7 +7851,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationContext"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -7411,7 +7866,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -7431,7 +7886,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -7450,7 +7905,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
     post:
       tags:
       - "tapi-path-computation"
@@ -7463,7 +7918,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -7471,7 +7926,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -7487,7 +7942,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationService"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -7507,7 +7962,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -7531,7 +7986,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-path-computation"
@@ -7548,7 +8003,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -7556,7 +8011,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -7577,7 +8032,7 @@ paths:
         200:
           description: "tapi.path.computation.PathServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -7601,7 +8056,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -7630,8 +8085,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.Capacity"
@@ -7651,7 +8106,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -7675,7 +8130,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -7704,7 +8159,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -7733,8 +8188,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.BandwidthProfile"
@@ -7754,7 +8209,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -7778,7 +8233,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -7807,7 +8262,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -7836,7 +8291,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -7857,7 +8312,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -7881,7 +8336,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7910,7 +8365,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7939,7 +8394,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -7960,7 +8415,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -7984,7 +8439,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8013,7 +8468,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8042,7 +8497,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8063,7 +8518,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8087,7 +8542,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8116,7 +8571,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8145,7 +8600,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8166,7 +8621,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8190,7 +8645,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8219,7 +8674,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8248,8 +8703,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
@@ -8270,247 +8725,15 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8523,11 +8746,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8538,8 +8761,9 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8552,11 +8776,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8567,8 +8791,9 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8585,7 +8810,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8599,12 +8824,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.common.NameAndValue.body-param"
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8612,8 +8842,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -8626,6 +8856,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -8635,7 +8870,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -8651,6 +8886,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -8661,7 +8901,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8682,6 +8922,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -8692,11 +8937,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8704,17 +8949,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathObjectiveFunction"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8722,12 +8972,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -8738,7 +8993,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8746,12 +9001,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -8762,7 +9022,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8770,12 +9030,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8794,7 +9059,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8802,7 +9067,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -8825,7 +9090,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -8851,7 +9116,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8882,11 +9147,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8896,15 +9161,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8913,12 +9178,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ to list"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -8929,7 +9193,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8938,12 +9202,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -8954,7 +9217,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8967,7 +9230,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8986,7 +9249,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8994,8 +9257,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -9017,7 +9280,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -9043,7 +9306,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9074,187 +9337,68 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.topology.CostCharacteristic"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
-    put:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - in: "body"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9265,32 +9409,27 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9298,11 +9437,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9310,54 +9449,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9368,18 +9509,19 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -9387,11 +9529,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9399,17 +9541,41 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9418,11 +9584,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9433,7 +9599,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9442,11 +9608,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9457,7 +9623,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9470,30 +9636,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9501,11 +9650,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9513,106 +9662,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-    post:
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9622,26 +9719,33 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9649,11 +9753,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9661,52 +9765,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.RiskCharacteristic"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9717,17 +9823,18 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
@@ -9735,11 +9842,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9749,15 +9856,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.TopologyConstraint"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9766,11 +9873,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9781,7 +9888,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9790,11 +9897,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9805,7 +9912,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9818,151 +9925,91 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.Path"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.path.computation.ValueOrPriority"
@@ -9970,91 +10017,98 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
         400:
           description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10062,42 +10116,52 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePoint"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10107,13 +10171,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
@@ -10121,171 +10190,141 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
+      - name: "link-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -10293,7 +10332,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       - name: "value-name"
@@ -10305,199 +10344,160 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -10508,7 +10508,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -10522,7 +10522,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -10541,7 +10541,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -10560,7 +10560,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -10571,10 +10571,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -10592,10 +10592,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -10611,10 +10611,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -10630,10 +10630,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -10654,10 +10654,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -10678,10 +10678,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -10702,11 +10702,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -10726,10 +10726,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -10750,11 +10750,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -10774,11 +10774,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -10798,10 +10798,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -10823,10 +10823,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -10853,11 +10853,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -10883,10 +10883,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -10914,10 +10914,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -10953,10 +10953,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -10977,11 +10977,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -11007,10 +11007,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11032,11 +11032,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -11056,10 +11056,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11080,10 +11080,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11104,11 +11104,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11128,10 +11128,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11152,10 +11152,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11177,11 +11177,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -11207,10 +11207,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11233,10 +11233,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -11257,10 +11257,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11296,10 +11296,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11320,10 +11320,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -11344,11 +11344,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11368,10 +11368,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11392,11 +11392,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11416,11 +11416,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11440,10 +11440,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11465,10 +11465,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11495,10 +11495,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -11519,11 +11519,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -11549,10 +11549,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11580,11 +11580,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -11609,11 +11609,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -11638,10 +11638,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -11667,10 +11667,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11696,10 +11696,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11725,10 +11725,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11754,10 +11754,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11783,10 +11783,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11813,10 +11813,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -11848,10 +11848,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11884,10 +11884,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11936,10 +11936,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -11970,10 +11970,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -12004,10 +12004,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12038,10 +12038,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12072,10 +12072,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12106,10 +12106,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12140,10 +12140,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12175,10 +12175,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12215,10 +12215,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12255,10 +12255,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12296,10 +12296,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12336,10 +12336,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -12375,10 +12375,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -12426,10 +12426,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -12467,10 +12467,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12513,10 +12513,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -12554,10 +12554,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -12589,10 +12589,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -12623,10 +12623,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12657,10 +12657,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12691,10 +12691,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12725,10 +12725,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12759,10 +12759,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12794,10 +12794,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12829,11 +12829,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -12865,10 +12865,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12909,10 +12909,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12955,10 +12955,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12990,11 +12990,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -13024,10 +13024,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -13070,10 +13070,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -13106,10 +13106,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13147,10 +13147,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -13183,10 +13183,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -13213,10 +13213,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -13242,10 +13242,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13271,10 +13271,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13300,10 +13300,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13329,10 +13329,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13358,10 +13358,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13388,11 +13388,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -13417,10 +13417,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -13461,10 +13461,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -13490,10 +13490,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -13519,10 +13519,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13548,10 +13548,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13577,10 +13577,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13606,10 +13606,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13635,10 +13635,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13665,15 +13665,17 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
-      description: "none"
+      - "tapi-topology"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13690,19 +13692,26 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ceplist.ConnectionEndPoint"
-      description: "none"
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13719,23 +13728,23 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ceplist.ConnectionEndPoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13753,47 +13762,19 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "aggregated-connection-end-point-node-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "aggregated-connection-end-point-connection-end-point-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.CepRole"
-      description: "Defines the role of the CEP in the context of the connection spec.\r\
-        \n                There may be many cep role - connection spec combinations\
-        \ for a particular CEP where each corresponds to a specific connection associated\
-        \ with the CEP."
+      summary: "returns tapi.connectivity.ceplist.ConnectionEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13817,17 +13798,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.CepRole"
+          description: "tapi.connectivity.ceplist.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "The reference to the spec that defines the cep role."
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13849,68 +13830,76 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "aggregated-connection-end-point-node-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "aggregated-connection-end-point-connection-end-point-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
-      description: "none"
+      summary: "returns tapi.connectivity.CepRole"
+      description: "Defines the role of the CEP in the context of the connection spec.\r\
+        \n                There may be many cep role - connection spec combinations\
+        \ for a particular CEP where each corresponds to a specific connection associated\
+        \ with the CEP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of topology"
         required: true
         type: "string"
-      - name: "topology-uuid"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of node"
         required: true
         type: "string"
-      - name: "client-node-edge-point-node-uuid"
+      - name: "owned-node-edge-point-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of client-node-edge-point"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepMipList"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "The reference to the spec that defines the cep role."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13934,16 +13923,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepMipList"
+          description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.oam.MepMipList"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mep={meg-uuid},{mep-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13966,29 +13955,36 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of client-node-edge-point"
         required: true
         type: "string"
-      - name: "mep-local-id"
+      - name: "client-node-edge-point-node-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mip={meg-uuid},{mip-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -14010,31 +14006,24 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      - name: "mip-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mip"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MipRef"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.topology.NodeEdgePointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14056,23 +14045,18 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepMipList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14097,19 +14081,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.oam.MepMipList"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.oam.MepMipListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mep={meg-uuid},{mep-local-id}/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14126,26 +14108,34 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "service-interface-point-uuid"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of mapped-service-interface-point"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      - name: "mep-local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mip={meg-uuid},{mip-local-id}/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14162,19 +14152,29 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      - name: "mip-local-id"
+        in: "path"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -14201,10 +14201,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -14230,10 +14230,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14259,10 +14259,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14288,10 +14288,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14317,10 +14317,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14346,10 +14346,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14376,10 +14376,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -14401,11 +14401,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -14425,10 +14425,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14449,10 +14449,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14473,11 +14473,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -14497,10 +14497,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14521,10 +14521,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -14546,505 +14546,506 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-job/:
+  /operations/tapi-connectivity:create-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamJob"
-      description: "operates on tapi.oam.CreateOamJob"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamjob.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamjob.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamJob"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service-end-point/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
-      description: "operates on tapi.oam.CreateOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamService"
-      description: "operates on tapi.oam.CreateOamService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectionDetails"
+      description: "operates on tapi.connectivity.GetConnectionDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamservice.Input.body-param"
+        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
+      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
+        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-job/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamJob"
-      description: "operates on tapi.oam.DeleteOamJob"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.deleteoamjob.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
+      - "tapi-connectivity"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service-end-point/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
-      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamService"
-      description: "operates on tapi.oam.DeleteOamService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamservice.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionDetails"
-      description: "operates on tapi.connectivity.GetConnectionDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
-      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
+      - "tapi-notification"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-connectivity"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-meg/:
+  /operations/tapi-oam:create-oam-job/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetMeg"
-      description: "operates on tapi.oam.GetMeg"
+      summary: "operates on tapi.oam.CreateOamJob"
+      description: "operates on tapi.oam.CreateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.oam.getmeg.Input.body-param"
+        name: "tapi.oam.createoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getmeg.Input"
+              $ref: "#/definitions/tapi.oam.createoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetMeg"
+            $ref: "#/definitions/tapi.oam.CreateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-oam:create-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
+      description: "operates on tapi.oam.CreateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-oam:create-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamService"
+      description: "operates on tapi.oam.CreateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.oam.createoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-oam:delete-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamJob"
+      description: "operates on tapi.oam.DeleteOamJob"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
+        name: "tapi.oam.deleteoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-oam:delete-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-oam:delete-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamService"
+      description: "operates on tapi.oam.DeleteOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.deleteoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-oam:get-meg/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetMeg"
+      description: "operates on tapi.oam.GetMeg"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.getmeg.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.getmeg.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.oam.GetMeg"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-job/:
+  /operations/tapi-oam:get-oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -15067,7 +15068,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-end-point/:
+  /operations/tapi-oam:get-oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -15090,7 +15091,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-list/:
+  /operations/tapi-oam:get-oam-service-list/:
     post:
       tags:
       - "tapi-oam"
@@ -15104,7 +15105,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service/:
+  /operations/tapi-oam:get-oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -15127,247 +15128,246 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-oam:update-oam-job/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamJob"
+      description: "operates on tapi.oam.UpdateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.oam.updateoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/get-service-interface-point-list/:
-    post:
-      tags:
-      - "tapi-common"
-      parameters: []
+              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.oam.UpdateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-oam:update-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-oam:update-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamService"
+      description: "operates on tapi.oam.UpdateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.oam.updateoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.oam.UpdateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-topology"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-connectivity-service/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-job/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamJob"
-      description: "operates on tapi.oam.UpdateOamJob"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamjob.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamJob"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service-end-point/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
-      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamService"
-      description: "operates on tapi.oam.UpdateOamService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamservice.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamService"
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -15423,6 +15423,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -15466,6 +15470,14 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
@@ -15474,6 +15486,10 @@ definitions:
     - $ref: "#/definitions/tapi.oam.ContextAugmentation2"
     - $ref: "#/definitions/tapi.path.computation.ContextAugmentation3"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation5"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -15555,6 +15571,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -15615,6 +15635,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -15667,6 +15695,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.common.TimePeriod"
+  tapi.common.TimeIntervalWrapper:
+    properties:
+      elapsed-time:
+        $ref: "#/definitions/tapi.common.TimeInterval"
   tapi.common.TimePeriod:
     type: "object"
     properties:
@@ -15677,6 +15709,10 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.TimeUnit"
+  tapi.common.TimePeriodWrapper:
+    properties:
+      period:
+        $ref: "#/definitions/tapi.common.TimePeriod"
   tapi.common.TimeRange:
     type: "object"
     properties:
@@ -15686,6 +15722,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.TimeUnit:
     type: "string"
     enum:
@@ -15737,6 +15777,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -15845,6 +15889,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -15852,6 +15900,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -15864,6 +15916,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -15929,6 +15989,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -16018,6 +16082,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+  tapi.connectivity.ConnectivityServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -16025,6 +16097,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+  tapi.connectivity.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityService"
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
@@ -16163,6 +16243,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -16195,6 +16279,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -16300,6 +16392,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -16309,6 +16413,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
     - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation1"
+  tapi.connectivity.ceplist.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -16319,6 +16427,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
       description: "none"
+  tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
   tapi.connectivity.createconnectivityservice.Input:
     type: "object"
     properties:
@@ -16455,6 +16567,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -16506,6 +16622,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -16578,6 +16698,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -16591,6 +16715,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -16621,6 +16749,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -16629,6 +16761,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -16717,6 +16853,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -16749,6 +16889,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -16953,6 +17097,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid"
+  tapi.oam.MegRefWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.MegRef"
+  tapi.oam.MegWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.Meg"
   tapi.oam.Mep:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -16987,6 +17139,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepMipListWrapper:
+    properties:
+      tapi-oam:mep-mip-list:
+        $ref: "#/definitions/tapi.oam.MepMipList"
   tapi.oam.MepRef:
     allOf:
     - $ref: "#/definitions/tapi.oam.MegRef"
@@ -16997,6 +17153,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MepRefWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.Mep"
   tapi.oam.Mip:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17016,6 +17180,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MipRefWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.MipRef"
+  tapi.oam.MipWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.Mip"
   tapi.oam.OamConstraint:
     type: "object"
     properties:
@@ -17052,6 +17224,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.Meg"
+  tapi.oam.OamContextWrapper:
+    properties:
+      tapi-oam:oam-context:
+        $ref: "#/definitions/tapi.oam.OamContext"
   tapi.oam.OamJob:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -17085,6 +17261,10 @@ definitions:
           type: "string"
           description: "none"
       description: "none"
+  tapi.oam.OamJobWrapper:
+    properties:
+      oam-job:
+        $ref: "#/definitions/tapi.oam.OamJob"
   tapi.oam.OamProfile:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -17108,6 +17288,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid"
+  tapi.oam.OamProfileRefWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfileRef"
+  tapi.oam.OamProfileWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfile"
   tapi.oam.OamService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -17176,6 +17364,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id"
       description: "none"
+  tapi.oam.OamServiceEndPointRefWrapper:
+    properties:
+      oam-service-end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+  tapi.oam.OamServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
   tapi.oam.OamServiceRef:
     type: "object"
     properties:
@@ -17183,6 +17379,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid"
+  tapi.oam.OamServiceWrapper:
+    properties:
+      oam-service:
+        $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.PmBinData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17192,6 +17392,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmBinDataWrapper:
+    properties:
+      pm-bin-data:
+        $ref: "#/definitions/tapi.oam.PmBinData"
   tapi.oam.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17231,6 +17435,10 @@ definitions:
             \ hour in case of a 15 minute interval and bound to the hour in case of\
             \ a 24 hour interval."
       description: "none"
+  tapi.oam.PmCurrentDataWrapper:
+    properties:
+      pm-current-data:
+        $ref: "#/definitions/tapi.oam.PmCurrentData"
   tapi.oam.PmHistoryData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17248,6 +17456,10 @@ definitions:
             \ be reliable."
           default: false
       description: "none"
+  tapi.oam.PmHistoryDataWrapper:
+    properties:
+      pm-history-data:
+        $ref: "#/definitions/tapi.oam.PmHistoryData"
   tapi.oam.PmThresholdData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17261,6 +17473,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmThresholdDataWrapper:
+    properties:
+      pm-threshold-data:
+        $ref: "#/definitions/tapi.oam.PmThresholdData"
   tapi.oam.UpdateOamJob:
     type: "object"
     properties:
@@ -17567,6 +17783,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -17595,6 +17815,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17616,6 +17840,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17625,6 +17853,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -17632,6 +17864,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -17668,6 +17904,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -17720,6 +17964,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -17772,6 +18020,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -17783,6 +18035,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -17852,6 +18108,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
@@ -17875,6 +18135,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -17931,6 +18195,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -17957,6 +18225,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -18011,6 +18283,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -18022,6 +18302,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -18111,6 +18395,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -18166,6 +18454,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -18188,6 +18484,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -18208,6 +18508,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -18233,6 +18537,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -18347,6 +18655,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -18366,6 +18678,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -18403,6 +18719,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -18410,6 +18730,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -18475,6 +18803,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -18556,6 +18888,10 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation1"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -18590,3 +18926,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
diff --git a/OAS/tapi-odu@2020-04-23.yaml b/OAS/tapi-odu@2020-04-23.yaml
index 5a0076ad..cc67f6cc 100644
--- a/OAS/tapi-odu@2020-04-23.yaml
+++ b/OAS/tapi-odu@2020-04-23.yaml
@@ -1,24 +1,24 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Connectivity Model definitions.\r\
-    \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI ODU Model definitions.\r\
+    \ the Apache License 2.0,\r\n        This module contains TAPI ODU Model definitions.\r\
     \n        Source: TapiOdu.uml\r\n        - The TAPI YANG models included in this\
     \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
     \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
@@ -52,41 +52,41 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
-    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -137,8 +137,8 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0"
-  version: "2.2.0"
-  title: "tapi-connectivity,tapi-odu,tapi-oam,tapi-topology,tapi-notification,tapi-common,tapi-path-computation,tapi-dsr\
+  version: "2.1.3"
+  title: "tapi-notification,tapi-odu,tapi-oam,tapi-connectivity,tapi-topology,tapi-common,tapi-path-computation,tapi-dsr\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -146,7 +146,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -157,7 +157,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -171,7 +171,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -190,7 +190,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -209,32 +209,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.context.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -242,18 +231,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.context.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -263,183 +280,708 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityContext"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.context.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
+      - in: "body"
+        name: "tapi.connectivity.context.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Connection"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "connection-uuid"
+        in: "path"
+        description: "Id of lower-connection"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Route"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
@@ -471,10 +1013,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -502,10 +1044,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
     get:
       tags:
       - "tapi-connectivity"
@@ -526,11 +1068,11 @@ paths:
         200:
           description: "tapi.connectivity.ResilienceRoute"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -557,11 +1099,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LinkRef"
@@ -586,10 +1128,10 @@ paths:
         200:
           description: "tapi.topology.LinkRef"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -610,11 +1152,11 @@ paths:
         200:
           description: "tapi.connectivity.SwitchControl"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -641,11 +1183,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.ResilienceType"
@@ -665,10 +1207,10 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -699,11 +1241,11 @@ paths:
         200:
           description: "tapi.connectivity.SwitchControlRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.Switch"
@@ -728,11 +1270,11 @@ paths:
         200:
           description: "tapi.connectivity.Switch"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -764,10 +1306,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -813,10 +1355,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -852,10 +1394,10 @@ paths:
         200:
           description: "tapi.connectivity.RouteRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
     post:
       tags:
       - "tapi-connectivity"
@@ -868,7 +1410,7 @@ paths:
           \ be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -876,7 +1418,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -892,7 +1434,7 @@ paths:
         200:
           description: "tapi.connectivity.connectivitycontext.ConnectivityService"
           schema:
-            $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+            $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -912,7 +1454,7 @@ paths:
           \ be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -936,7 +1478,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -957,10 +1499,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
     get:
       tags:
       - "tapi-connectivity"
@@ -976,7 +1518,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -995,7 +1537,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1019,7 +1561,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1043,7 +1585,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1061,7 +1603,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1069,7 +1611,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1091,7 +1633,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -1116,7 +1658,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -1146,7 +1688,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1163,7 +1705,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1171,8 +1713,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.ConnectivityServiceRef"
@@ -1192,7 +1734,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -1216,7 +1758,7 @@ paths:
         description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -1245,7 +1787,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-connectivity"
@@ -1263,7 +1805,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1271,7 +1813,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1292,7 +1834,7 @@ paths:
         200:
           description: "tapi.connectivity.connectivityservice.EndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+            $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -1317,7 +1859,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1346,7 +1888,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -1367,7 +1909,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -1391,7 +1933,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1420,7 +1962,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1449,8 +1991,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -1470,7 +2012,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -1494,7 +2036,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1523,7 +2065,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -1552,7 +2094,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1573,7 +2115,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1597,7 +2139,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1626,7 +2168,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1655,7 +2197,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1676,7 +2218,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1700,7 +2242,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1729,7 +2271,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1758,8 +2300,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1779,7 +2321,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1803,7 +2345,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1832,7 +2374,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1861,7 +2403,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-connectivity"
@@ -1882,7 +2424,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1906,7 +2448,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1935,7 +2477,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1964,8 +2506,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -1986,7 +2528,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -2011,7 +2553,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2041,7 +2583,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2071,7 +2613,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -2112,10 +2654,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -2139,7 +2681,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2147,8 +2689,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
@@ -2175,7 +2717,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2206,7 +2748,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2242,11 +2784,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2261,15 +2803,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2283,11 +2825,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2297,8 +2840,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2312,11 +2855,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2326,8 +2870,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2345,11 +2889,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCommonPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2364,15 +2908,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepCommonPac"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCommonPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2386,11 +2930,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2400,8 +2945,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2415,11 +2960,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2429,8 +2975,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCommonPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2448,11 +2994,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCtpPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2467,15 +3013,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepCtpPac"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCtpPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2489,11 +3035,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2503,8 +3050,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2518,11 +3065,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2532,8 +3080,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCtpPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2551,11 +3099,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepTtpPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2570,15 +3118,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepTtpPac"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepTtpPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2592,11 +3140,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2606,8 +3154,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2621,11 +3169,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2635,8 +3183,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepTtpPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2654,11 +3202,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2673,15 +3221,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2695,12 +3243,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -2710,8 +3257,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2725,12 +3272,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -2740,8 +3286,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2759,11 +3305,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-common-pac/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2778,15 +3324,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.odu.OduCsepCommonPac"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2800,12 +3346,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -2815,8 +3360,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2830,12 +3375,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -2845,8 +3389,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2864,11 +3408,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2883,15 +3427,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.odu.OduCsepCtpPac"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2905,12 +3449,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -2920,8 +3463,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2935,12 +3478,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -2950,8 +3492,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2969,11 +3511,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepTtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -2988,15 +3530,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.odu.OduCsepTtpPac"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepTtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3010,11 +3552,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -3024,8 +3566,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepTtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3039,11 +3581,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -3053,8 +3595,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepTtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3072,7 +3614,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3090,7 +3632,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3098,8 +3640,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -3120,7 +3662,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -3145,7 +3687,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3175,7 +3717,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3191,7 +3733,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3210,7 +3752,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3234,7 +3776,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3258,7 +3800,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3274,7 +3816,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3293,7 +3835,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3317,7 +3859,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3341,7 +3883,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3357,7 +3899,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3376,7 +3918,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3400,7 +3942,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3424,7 +3966,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
     post:
       tags:
       - "tapi-connectivity"
@@ -3443,7 +3985,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3451,7 +3993,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3474,7 +4016,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -3500,7 +4042,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3531,7 +4073,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
       - "tapi-connectivity"
@@ -3547,7 +4089,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3566,7 +4108,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3590,7 +4132,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3614,8 +4156,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.BandwidthProfile"
@@ -3630,7 +4172,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -3649,7 +4191,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3673,7 +4215,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3697,8 +4239,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3713,7 +4255,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3732,7 +4274,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3756,7 +4298,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3780,8 +4322,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3796,7 +4338,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3815,7 +4357,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3839,7 +4381,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3863,8 +4405,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3879,7 +4421,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3898,7 +4440,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3922,7 +4464,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3946,8 +4488,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.common.CapacityValue"
@@ -3962,7 +4504,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -3981,7 +4523,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4005,7 +4547,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4029,7 +4571,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
     get:
       tags:
       - "tapi-connectivity"
@@ -4046,7 +4588,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -4066,7 +4608,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4091,7 +4633,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4116,7 +4658,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
     get:
       tags:
       - "tapi-connectivity"
@@ -4132,7 +4674,7 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
     post:
@@ -4151,7 +4693,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -4175,7 +4717,7 @@ paths:
         description: "tapi.topology.ResilienceType to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -4199,7 +4741,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
@@ -4216,7 +4758,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -4224,8 +4766,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -4245,7 +4787,7 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -4269,7 +4811,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -4298,7 +4840,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
       - "tapi-connectivity"
@@ -4314,7 +4856,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -4333,7 +4875,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -4357,7 +4899,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -4381,94 +4923,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/name={value-name}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
@@ -4479,7 +4934,7 @@ paths:
         200:
           description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4493,7 +4948,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4512,7 +4967,7 @@ paths:
         description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4531,7 +4986,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
@@ -4544,7 +4999,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4552,7 +5007,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4568,7 +5023,7 @@ paths:
         200:
           description: "tapi.notification.NotificationSubscriptionService"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -4588,7 +5043,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -4612,7 +5067,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -4631,7 +5086,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4639,7 +5094,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -4662,7 +5117,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -4688,7 +5143,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4719,7 +5174,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
@@ -4735,11 +5190,11 @@ paths:
         200:
           description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4761,10 +5216,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -4785,11 +5240,11 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4814,11 +5269,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.AlarmInfo"
@@ -4838,11 +5293,11 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.NameAndValueChange"
@@ -4867,11 +5322,11 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4898,11 +5353,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -4927,11 +5382,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.TcaInfo"
@@ -4951,10 +5406,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
       - "tapi-notification"
@@ -4970,7 +5425,7 @@ paths:
         200:
           description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
@@ -4989,7 +5444,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -5013,7 +5468,7 @@ paths:
         description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -5037,7 +5492,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
       - "tapi-notification"
@@ -5056,7 +5511,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5064,8 +5519,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
@@ -5087,7 +5542,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5113,7 +5568,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5144,7 +5599,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
       - "tapi-notification"
@@ -5160,10 +5615,10 @@ paths:
         200:
           description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -5184,10 +5639,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
       - "tapi-notification"
@@ -5203,10 +5658,10 @@ paths:
         200:
           description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -5227,10 +5682,10 @@ paths:
         200:
           description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -5253,10 +5708,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -5277,10 +5732,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
       - "tapi-notification"
@@ -5296,10 +5751,10 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/:
+  /data/tapi-common:context/tapi-oam:oam-context/:
     get:
       tags:
       - "tapi-oam"
@@ -5310,7 +5765,7 @@ paths:
         200:
           description: "tapi.oam.OamContext"
           schema:
-            $ref: "#/definitions/tapi.oam.OamContext"
+            $ref: "#/definitions/tapi.oam.OamContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -5324,7 +5779,7 @@ paths:
         description: "tapi.oam.OamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -5343,7 +5798,7 @@ paths:
         description: "tapi.oam.OamContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -5362,7 +5817,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/meg={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5378,10 +5833,10 @@ paths:
         200:
           description: "tapi.oam.oamcontext.Meg"
           schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.Meg"
+            $ref: "#/definitions/tapi.oam.oamcontext.MegWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -5405,10 +5860,10 @@ paths:
         200:
           description: "tapi.oam.meg.Mep"
           schema:
-            $ref: "#/definitions/tapi.oam.meg.Mep"
+            $ref: "#/definitions/tapi.oam.meg.MepWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5436,10 +5891,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/:
     get:
       tags:
       - "tapi-odu"
@@ -5460,10 +5915,10 @@ paths:
         200:
           description: "tapi.odu.OduConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-common/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-common/:
     get:
       tags:
       - "tapi-odu"
@@ -5484,10 +5939,10 @@ paths:
         200:
           description: "tapi.odu.OduCommonPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCommonPac"
+            $ref: "#/definitions/tapi.odu.OduCommonPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-ctp/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-ctp/:
     get:
       tags:
       - "tapi-odu"
@@ -5508,10 +5963,10 @@ paths:
         200:
           description: "tapi.odu.OduCtpPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCtpPac"
+            $ref: "#/definitions/tapi.odu.OduCtpPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-protection/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-protection/:
     get:
       tags:
       - "tapi-odu"
@@ -5532,11 +5987,11 @@ paths:
         200:
           description: "tapi.odu.OduProtectionPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduProtectionPac"
+            $ref: "#/definitions/tapi.odu.OduProtectionPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/
+  : get:
       tags:
       - "tapi-odu"
       summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
@@ -5556,11 +6011,11 @@ paths:
         200:
           description: "tapi.odu.OduTerminationAndClientAdaptationPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  : get:
       tags:
       - "tapi-odu"
       summary: "returns tapi.odu.OduPayloadType"
@@ -5585,11 +6040,11 @@ paths:
         200:
           description: "tapi.odu.OduPayloadType"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPayloadType"
+            $ref: "#/definitions/tapi.odu.OduPayloadTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  : get:
       tags:
       - "tapi-odu"
       summary: "returns tapi.odu.FecProperties"
@@ -5609,10 +6064,10 @@ paths:
         200:
           description: "tapi.odu.FecProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.FecProperties"
+            $ref: "#/definitions/tapi.odu.FecPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -5633,10 +6088,10 @@ paths:
         200:
           description: "tapi.oam.meg.Mip"
           schema:
-            $ref: "#/definitions/tapi.oam.meg.Mip"
+            $ref: "#/definitions/tapi.oam.meg.MipWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5664,10 +6119,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/:
     get:
       tags:
       - "tapi-odu"
@@ -5688,10 +6143,10 @@ paths:
         200:
           description: "tapi.odu.OduMipSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduMipSpec"
+            $ref: "#/definitions/tapi.odu.OduMipSpecWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-defect/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-defect/:
     get:
       tags:
       - "tapi-odu"
@@ -5712,10 +6167,10 @@ paths:
         200:
           description: "tapi.odu.OduDefectPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduDefectPac"
+            $ref: "#/definitions/tapi.odu.OduDefectPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-mip/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-mip/:
     get:
       tags:
       - "tapi-odu"
@@ -5736,10 +6191,10 @@ paths:
         200:
           description: "tapi.odu.OduMipPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduMipPac"
+            $ref: "#/definitions/tapi.odu.OduMipPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-mip/deg-thr/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-mip/deg-thr/:
     get:
       tags:
       - "tapi-odu"
@@ -5767,10 +6222,10 @@ paths:
         200:
           description: "tapi.odu.DegThr"
           schema:
-            $ref: "#/definitions/tapi.odu.DegThr"
+            $ref: "#/definitions/tapi.odu.DegThrWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-ncm/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-ncm/:
     get:
       tags:
       - "tapi-odu"
@@ -5791,10 +6246,10 @@ paths:
         200:
           description: "tapi.odu.OduNcmPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduNcmPac"
+            $ref: "#/definitions/tapi.odu.OduNcmPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-pm/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-pm/:
     get:
       tags:
       - "tapi-odu"
@@ -5815,10 +6270,10 @@ paths:
         200:
           description: "tapi.odu.OduPmPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPmPac"
+            $ref: "#/definitions/tapi.odu.OduPmPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-pm/uas/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-pm/uas/:
     get:
       tags:
       - "tapi-odu"
@@ -5839,10 +6294,10 @@ paths:
         200:
           description: "tapi.odu.UasChoice"
           schema:
-            $ref: "#/definitions/tapi.odu.UasChoice"
+            $ref: "#/definitions/tapi.odu.UasChoiceWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-tcm/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-tcm/:
     get:
       tags:
       - "tapi-odu"
@@ -5863,10 +6318,10 @@ paths:
         200:
           description: "tapi.odu.OduTcmMipPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTcmMipPac"
+            $ref: "#/definitions/tapi.odu.OduTcmMipPacWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -5889,10 +6344,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -5904,7 +6359,7 @@ paths:
         description: "tapi.oam.OamJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5912,7 +6367,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -5928,7 +6383,7 @@ paths:
         200:
           description: "tapi.oam.OamJob"
           schema:
-            $ref: "#/definitions/tapi.oam.OamJob"
+            $ref: "#/definitions/tapi.oam.OamJobWrapper"
         400:
           description: "Internal error"
     put:
@@ -5947,7 +6402,7 @@ paths:
         description: "tapi.oam.OamJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -5971,7 +6426,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -5990,7 +6445,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5998,7 +6453,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6021,7 +6476,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6047,7 +6502,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6078,7 +6533,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -6094,7 +6549,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -6113,7 +6568,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6137,7 +6592,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6161,7 +6616,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -6178,7 +6633,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6186,8 +6641,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.OamServiceEndPointRef"
@@ -6212,7 +6667,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -6241,7 +6696,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -6275,7 +6730,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6300,10 +6755,10 @@ paths:
         200:
           description: "tapi.oam.PmCurrentData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmCurrentData"
+            $ref: "#/definitions/tapi.oam.PmCurrentDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
     get:
       tags:
       - "tapi-oam"
@@ -6324,10 +6779,10 @@ paths:
         200:
           description: "tapi.common.TimeInterval"
           schema:
-            $ref: "#/definitions/tapi.common.TimeInterval"
+            $ref: "#/definitions/tapi.common.TimeIntervalWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
     get:
       tags:
       - "tapi-oam"
@@ -6353,10 +6808,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -6377,10 +6832,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6408,11 +6863,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.PmHistoryData"
@@ -6440,10 +6895,10 @@ paths:
         200:
           description: "tapi.oam.PmHistoryData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmHistoryData"
+            $ref: "#/definitions/tapi.oam.PmHistoryDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
   : get:
       tags:
       - "tapi-oam"
@@ -6469,10 +6924,10 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-oam"
@@ -6505,10 +6960,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/schedule/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/schedule/:
     get:
       tags:
       - "tapi-oam"
@@ -6524,7 +6979,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -6543,7 +6998,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -6567,7 +7022,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -6591,7 +7046,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile/:
     post:
       tags:
       - "tapi-oam"
@@ -6603,7 +7058,7 @@ paths:
         description: "tapi.oam.OamProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -6611,7 +7066,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -6627,7 +7082,7 @@ paths:
         200:
           description: "tapi.oam.OamProfile"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfile"
+            $ref: "#/definitions/tapi.oam.OamProfileWrapper"
         400:
           description: "Internal error"
     put:
@@ -6646,7 +7101,7 @@ paths:
         description: "tapi.oam.OamProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -6670,7 +7125,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -6689,7 +7144,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6697,7 +7152,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -6720,7 +7175,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6746,7 +7201,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6777,7 +7232,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data/:
     post:
       tags:
       - "tapi-oam"
@@ -6794,7 +7249,7 @@ paths:
         description: "tapi.oam.PmBinData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6802,7 +7257,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -6823,7 +7278,7 @@ paths:
         200:
           description: "tapi.oam.PmBinData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmBinData"
+            $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -6847,7 +7302,7 @@ paths:
         description: "tapi.oam.PmBinData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -6876,7 +7331,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -6897,7 +7352,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -6921,7 +7376,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6950,7 +7405,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -6979,7 +7434,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -7003,7 +7458,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7011,7 +7466,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7039,7 +7494,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7070,7 +7525,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7106,7 +7561,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data/:
     post:
       tags:
       - "tapi-oam"
@@ -7123,7 +7578,7 @@ paths:
         description: "tapi.oam.PmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -7131,7 +7586,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -7152,7 +7607,7 @@ paths:
         200:
           description: "tapi.oam.PmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.oam.PmThresholdData"
+            $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
         400:
           description: "Internal error"
     put:
@@ -7176,7 +7631,7 @@ paths:
         description: "tapi.oam.PmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -7205,7 +7660,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
     get:
       tags:
       - "tapi-oam"
@@ -7226,7 +7681,7 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
@@ -7250,7 +7705,7 @@ paths:
         description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -7279,7 +7734,7 @@ paths:
         description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -7308,7 +7763,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -7332,7 +7787,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7340,7 +7795,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7368,7 +7823,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7399,7 +7854,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7435,7 +7890,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -7447,7 +7902,7 @@ paths:
         description: "tapi.oam.OamService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -7455,7 +7910,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/:
     get:
       tags:
       - "tapi-oam"
@@ -7471,7 +7926,7 @@ paths:
         200:
           description: "tapi.oam.OamService"
           schema:
-            $ref: "#/definitions/tapi.oam.OamService"
+            $ref: "#/definitions/tapi.oam.OamServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -7490,7 +7945,7 @@ paths:
         description: "tapi.oam.OamService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -7514,7 +7969,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -7531,7 +7986,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -7539,7 +7994,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -7560,7 +8015,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -7584,7 +8039,7 @@ paths:
         description: "tapi.oam.OamServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -7613,7 +8068,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
     get:
       tags:
       - "tapi-oam"
@@ -7634,7 +8089,7 @@ paths:
         200:
           description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -7659,7 +8114,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7689,7 +8144,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7718,7 +8173,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mep/:
     get:
       tags:
       - "tapi-oam"
@@ -7739,10 +8194,10 @@ paths:
         200:
           description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mip/:
     get:
       tags:
       - "tapi-oam"
@@ -7763,10 +8218,10 @@ paths:
         200:
           description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -7790,7 +8245,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7798,7 +8253,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -7826,7 +8281,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -7857,7 +8312,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7893,7 +8348,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
     get:
       tags:
       - "tapi-oam"
@@ -7914,7 +8369,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -7938,7 +8393,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7967,7 +8422,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -7996,7 +8451,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/meg/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/meg/:
     get:
       tags:
       - "tapi-oam"
@@ -8012,10 +8467,10 @@ paths:
         200:
           description: "tapi.oam.MegRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MegRef"
+            $ref: "#/definitions/tapi.oam.MegRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -8034,7 +8489,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8042,7 +8497,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -8065,7 +8520,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -8091,7 +8546,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8122,7 +8577,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -8138,7 +8593,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -8157,7 +8612,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -8181,7 +8636,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -8205,7 +8660,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
     get:
       tags:
       - "tapi-path-computation"
@@ -8216,7 +8671,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationContext"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -8231,7 +8686,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -8251,7 +8706,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -8270,7 +8725,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8283,7 +8738,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -8291,7 +8746,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -8307,7 +8762,7 @@ paths:
         200:
           description: "tapi.path.computation.PathComputationService"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -8327,7 +8782,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -8351,7 +8806,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-path-computation"
@@ -8368,7 +8823,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -8376,7 +8831,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -8397,7 +8852,7 @@ paths:
         200:
           description: "tapi.path.computation.PathServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -8421,7 +8876,7 @@ paths:
         description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -8450,8 +8905,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.Capacity"
@@ -8471,7 +8926,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -8495,7 +8950,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -8524,7 +8979,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -8553,8 +9008,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.BandwidthProfile"
@@ -8574,7 +9029,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -8598,7 +9053,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -8627,7 +9082,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -8656,7 +9111,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8677,7 +9132,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8701,7 +9156,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8730,7 +9185,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8759,7 +9214,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8780,7 +9235,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8804,7 +9259,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8833,7 +9288,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8862,7 +9317,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8883,7 +9338,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -8907,7 +9362,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8936,7 +9391,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8965,7 +9420,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -8986,7 +9441,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -9010,7 +9465,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9039,7 +9494,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9068,8 +9523,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
@@ -9090,7 +9545,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -9115,7 +9570,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9145,238 +9600,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9387,8 +9611,9 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9405,7 +9630,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -9419,12 +9644,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.common.NameAndValue.body-param"
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9432,8 +9662,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -9446,6 +9676,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9455,7 +9690,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -9471,6 +9706,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9481,7 +9721,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9502,6 +9742,11 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9512,11 +9757,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9524,17 +9769,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathObjectiveFunction"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9542,12 +9792,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -9558,7 +9813,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9566,12 +9821,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -9582,7 +9842,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9590,12 +9850,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -9614,7 +9879,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9622,7 +9887,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -9645,7 +9910,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -9671,7 +9936,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9702,11 +9967,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9716,15 +9981,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9733,12 +9998,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ to list"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -9749,7 +10013,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9758,12 +10022,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -9774,7 +10037,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9787,7 +10050,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -9806,7 +10069,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9814,8 +10077,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -9837,7 +10100,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -9863,7 +10126,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9894,35 +10157,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9932,15 +10171,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.RoutingConstraint"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9949,11 +10188,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9964,7 +10204,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9973,11 +10213,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9988,7 +10229,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10001,116 +10242,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -10118,11 +10257,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -10130,54 +10269,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -10188,18 +10329,19 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -10207,11 +10349,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10219,17 +10361,41 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10238,11 +10404,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -10253,7 +10419,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10262,11 +10428,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -10277,7 +10443,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10290,30 +10456,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -10321,11 +10470,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10333,106 +10482,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-    post:
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "cost-name"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10443,25 +10540,32 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
@@ -10469,11 +10573,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10481,52 +10585,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.RiskCharacteristic"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10537,17 +10643,18 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
@@ -10555,11 +10662,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10569,15 +10676,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.TopologyConstraint"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10586,11 +10693,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -10601,7 +10708,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10610,11 +10717,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -10625,7 +10732,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -10638,208 +10745,199 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
-      description: "none"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.Path"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of link"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.CostCharacteristic"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -10847,7 +10945,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - name: "risk-characteristic-name"
@@ -10859,65 +10957,31 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePoint"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10927,185 +10991,160 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
-      parameters:
-      - name: "uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.Capacity"
-          schema:
-            $ref: "#/definitions/tapi.common.Capacity"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
+        required: true
+        type: "string"
+      - name: "link-uuid"
+        in: "path"
+        description: "Id of link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -11113,7 +11152,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       - name: "value-name"
@@ -11125,199 +11164,160 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of path"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.topology.CostCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.Capacity"
-          schema:
-            $ref: "#/definitions/tapi.common.Capacity"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -11328,7 +11328,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -11342,7 +11342,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -11361,7 +11361,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -11380,7 +11380,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -11391,10 +11391,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11412,10 +11412,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -11431,10 +11431,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -11450,10 +11450,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -11474,10 +11474,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11498,10 +11498,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -11522,11 +11522,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11546,10 +11546,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11570,11 +11570,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11594,11 +11594,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11618,10 +11618,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11643,10 +11643,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11673,11 +11673,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -11703,10 +11703,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -11734,10 +11734,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -11773,10 +11773,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -11797,11 +11797,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -11827,10 +11827,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -11852,11 +11852,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -11876,10 +11876,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -11900,10 +11900,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11924,11 +11924,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -11948,10 +11948,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -11972,10 +11972,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -11997,11 +11997,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -12027,10 +12027,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -12053,10 +12053,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -12077,10 +12077,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12116,10 +12116,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -12140,10 +12140,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -12164,11 +12164,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -12188,10 +12188,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12212,11 +12212,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -12236,11 +12236,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -12260,10 +12260,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -12285,10 +12285,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -12315,10 +12315,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -12339,11 +12339,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -12369,10 +12369,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -12400,11 +12400,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -12429,11 +12429,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -12458,10 +12458,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -12487,10 +12487,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12516,10 +12516,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12545,10 +12545,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12574,10 +12574,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12603,10 +12603,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12633,10 +12633,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -12668,10 +12668,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12704,10 +12704,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -12756,10 +12756,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -12790,10 +12790,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -12824,10 +12824,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12858,10 +12858,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12892,10 +12892,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12926,10 +12926,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -12960,10 +12960,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -12995,10 +12995,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13035,10 +13035,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13075,10 +13075,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13116,10 +13116,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13156,10 +13156,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -13195,10 +13195,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -13246,10 +13246,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -13287,10 +13287,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13333,10 +13333,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -13374,10 +13374,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -13409,10 +13409,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -13443,10 +13443,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13477,10 +13477,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13511,10 +13511,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13545,10 +13545,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -13579,10 +13579,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -13614,10 +13614,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13649,11 +13649,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -13685,10 +13685,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -13729,10 +13729,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -13775,10 +13775,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13810,11 +13810,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -13844,10 +13844,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -13890,10 +13890,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -13926,10 +13926,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -13967,10 +13967,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -14003,10 +14003,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -14033,10 +14033,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -14062,10 +14062,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14091,10 +14091,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14120,10 +14120,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14149,10 +14149,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14178,10 +14178,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14208,11 +14208,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -14237,10 +14237,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -14281,10 +14281,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -14310,10 +14310,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -14339,10 +14339,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14368,10 +14368,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14397,10 +14397,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14426,10 +14426,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -14455,10 +14455,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -14485,11 +14485,83 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePointRef"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
@@ -14514,10 +14586,10 @@ paths:
         200:
           description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -14548,10 +14620,10 @@ paths:
         200:
           description: "tapi.connectivity.ceplist.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -14602,10 +14674,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
@@ -14639,10 +14711,10 @@ paths:
         200:
           description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
       - "tapi-connectivity"
@@ -14673,10 +14745,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -14722,15 +14794,17 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepMipList"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -14752,18 +14826,23 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.oam.MepMipList"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.MepMipList"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mep={meg-uuid},{mep-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14786,28 +14865,18 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      - name: "mep-local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mip={meg-uuid},{mip-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/
   : get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
+      summary: "returns tapi.oam.MepMipList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14830,31 +14899,19 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      - name: "mip-local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.oam.MipRef"
+          description: "tapi.oam.MepMipList"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.oam.MepMipListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mep={meg-uuid},{mep-local-id}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -14876,57 +14933,28 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectionEndPointSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
+      - name: "meg-uuid"
         in: "path"
-        description: "Id of owned-node-edge-point"
+        description: "Id of mep"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - name: "mep-local-id"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectionEndPointSpec"
+          description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-common/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mip={meg-uuid},{mip-local-id}/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCommonPac"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14946,55 +14974,31 @@ paths:
         type: "string"
       - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduCommonPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCommonPac"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-ctp/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCtpPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "owned-node-edge-point-uuid"
+      - name: "meg-uuid"
         in: "path"
-        description: "Id of owned-node-edge-point"
+        description: "Id of mip"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - name: "mip-local-id"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCtpPac"
+          description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCtpPac"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-protection/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/
   : get:
       tags:
       - "tapi-odu"
-      summary: "returns tapi.odu.OduProtectionPac"
+      summary: "returns tapi.odu.OduConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15019,16 +15023,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduProtectionPac"
+          description: "tapi.odu.OduConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduProtectionPac"
+            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-common/
   : get:
       tags:
       - "tapi-odu"
-      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
+      summary: "returns tapi.odu.OduCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15053,22 +15057,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          description: "tapi.odu.OduCommonPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+            $ref: "#/definitions/tapi.odu.OduCommonPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-ctp/
   : get:
       tags:
       - "tapi-odu"
-      summary: "returns tapi.odu.OduPayloadType"
-      description: "This attribute is applicable when the ODU CTP object instance\
-        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
-        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
-        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
-        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
-        \ G.709 with one additional value UN_INTERPRETABLE."
+      summary: "returns tapi.odu.OduCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -15092,16 +15091,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduPayloadType"
+          description: "tapi.odu.OduCtpPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPayloadType"
+            $ref: "#/definitions/tapi.odu.OduCtpPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-protection/
   : get:
       tags:
       - "tapi-odu"
-      summary: "returns tapi.odu.FecProperties"
+      summary: "returns tapi.odu.OduProtectionPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15126,16 +15125,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.FecProperties"
+          description: "tapi.odu.OduProtectionPac"
           schema:
-            $ref: "#/definitions/tapi.odu.FecProperties"
+            $ref: "#/definitions/tapi.odu.OduProtectionPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15160,19 +15159,22 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPayloadType"
+      description: "This attribute is applicable when the ODU CTP object instance\
+        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
+        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
+        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
+        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
+        \ G.709 with one additional value UN_INTERPRETABLE."
       parameters:
       - name: "uuid"
         in: "path"
@@ -15189,26 +15191,24 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "service-interface-point-uuid"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of mapped-service-interface-point"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.odu.OduPayloadType"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.odu.OduPayloadTypeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.FecProperties"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -15225,19 +15225,19 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.odu.FecProperties"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.odu.FecPropertiesWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/odu-node-edge-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-odu:odu-node-edge-point-spec/
   : get:
       tags:
       - "tapi-odu"
@@ -15264,10 +15264,10 @@ paths:
         200:
           description: "tapi.odu.OduNodeEdgePointSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
+            $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/odu-node-edge-point-spec/odu-pool/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-odu:odu-node-edge-point-spec/odu-pool/
   : get:
       tags:
       - "tapi-odu"
@@ -15293,10 +15293,10 @@ paths:
         200:
           description: "tapi.odu.OduPoolPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPoolPac"
+            $ref: "#/definitions/tapi.odu.OduPoolPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -15323,10 +15323,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -15352,10 +15352,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -15381,10 +15381,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15410,10 +15410,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -15439,10 +15439,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15468,10 +15468,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -15498,10 +15498,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -15523,11 +15523,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -15547,10 +15547,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -15571,10 +15571,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15595,11 +15595,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -15619,10 +15619,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -15643,10 +15643,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -15668,505 +15668,506 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-job/:
+  /operations/tapi-connectivity:create-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamJob"
-      description: "operates on tapi.oam.CreateOamJob"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamjob.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamjob.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamJob"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service-end-point/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
-      description: "operates on tapi.oam.CreateOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamService"
-      description: "operates on tapi.oam.CreateOamService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectionDetails"
+      description: "operates on tapi.connectivity.GetConnectionDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamservice.Input.body-param"
+        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
+      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
+        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-job/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamJob"
-      description: "operates on tapi.oam.DeleteOamJob"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.deleteoamjob.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
+      - "tapi-connectivity"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service-end-point/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
-      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamService"
-      description: "operates on tapi.oam.DeleteOamService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamservice.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionDetails"
-      description: "operates on tapi.connectivity.GetConnectionDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
-      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
+      - "tapi-notification"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-connectivity"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-meg/:
+  /operations/tapi-oam:create-oam-job/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetMeg"
-      description: "operates on tapi.oam.GetMeg"
+      summary: "operates on tapi.oam.CreateOamJob"
+      description: "operates on tapi.oam.CreateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.oam.getmeg.Input.body-param"
+        name: "tapi.oam.createoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getmeg.Input"
+              $ref: "#/definitions/tapi.oam.createoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetMeg"
+            $ref: "#/definitions/tapi.oam.CreateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-oam:create-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
+      description: "operates on tapi.oam.CreateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-oam:create-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamService"
+      description: "operates on tapi.oam.CreateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.oam.createoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-oam:delete-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamJob"
+      description: "operates on tapi.oam.DeleteOamJob"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
+        name: "tapi.oam.deleteoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-oam:delete-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-oam:delete-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamService"
+      description: "operates on tapi.oam.DeleteOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.deleteoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-oam:get-meg/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetMeg"
+      description: "operates on tapi.oam.GetMeg"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.getmeg.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.getmeg.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.oam.GetMeg"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-job/:
+  /operations/tapi-oam:get-oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -16189,7 +16190,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-end-point/:
+  /operations/tapi-oam:get-oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -16212,7 +16213,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-list/:
+  /operations/tapi-oam:get-oam-service-list/:
     post:
       tags:
       - "tapi-oam"
@@ -16226,7 +16227,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service/:
+  /operations/tapi-oam:get-oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -16249,247 +16250,246 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-oam:update-oam-job/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamJob"
+      description: "operates on tapi.oam.UpdateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.oam.updateoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/get-service-interface-point-list/:
-    post:
-      tags:
-      - "tapi-common"
-      parameters: []
+              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.oam.UpdateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-oam:update-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-oam:update-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamService"
+      description: "operates on tapi.oam.UpdateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.oam.updateoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.oam.UpdateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-topology"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-connectivity-service/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-job/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamJob"
-      description: "operates on tapi.oam.UpdateOamJob"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamjob.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamJob"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service-end-point/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
-      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamService"
-      description: "operates on tapi.oam.UpdateOamService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamservice.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamService"
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -16545,6 +16545,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -16588,14 +16592,26 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.connectivity.ContextAugmentation4"
-    - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
-    - $ref: "#/definitions/tapi.oam.ContextAugmentation2"
+    - $ref: "#/definitions/tapi.notification.ContextAugmentation2"
+    - $ref: "#/definitions/tapi.oam.ContextAugmentation1"
     - $ref: "#/definitions/tapi.path.computation.ContextAugmentation3"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation5"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -16677,6 +16693,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -16737,6 +16757,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -16789,6 +16817,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.common.TimePeriod"
+  tapi.common.TimeIntervalWrapper:
+    properties:
+      elapsed-time:
+        $ref: "#/definitions/tapi.common.TimeInterval"
   tapi.common.TimePeriod:
     type: "object"
     properties:
@@ -16799,6 +16831,10 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.TimeUnit"
+  tapi.common.TimePeriodWrapper:
+    properties:
+      period:
+        $ref: "#/definitions/tapi.common.TimePeriod"
   tapi.common.TimeRange:
     type: "object"
     properties:
@@ -16808,6 +16844,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.TimeUnit:
     type: "string"
     enum:
@@ -16859,6 +16899,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -16967,6 +17011,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -16974,6 +17022,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -16986,6 +17038,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -17051,6 +17111,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -17140,6 +17204,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -17147,6 +17215,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
@@ -17285,6 +17357,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -17317,6 +17393,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -17422,6 +17506,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -17430,8 +17526,12 @@ definitions:
   tapi.connectivity.ceplist.ConnectionEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
-    - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation2"
-    - $ref: "#/definitions/tapi.odu.ConnectionEndPointAugmentation1"
+    - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation1"
+    - $ref: "#/definitions/tapi.odu.ConnectionEndPointAugmentation2"
+  tapi.connectivity.ceplist.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
   tapi.connectivity.connectivitycontext.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -17453,10 +17553,18 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ConnectionRef"
       description: "none"
+  tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
   tapi.connectivity.connectivityservice.EndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
     - $ref: "#/definitions/tapi.odu.EndPointAugmentation1"
+  tapi.connectivity.connectivityservice.EndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -17467,6 +17575,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
       description: "none"
+  tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
   tapi.connectivity.createconnectivityservice.Input:
     type: "object"
     properties:
@@ -17603,7 +17715,11 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
-  tapi.notification.ContextAugmentation1:
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
+  tapi.notification.ContextAugmentation2:
     type: "object"
     properties:
       notification-context:
@@ -17654,6 +17770,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -17726,6 +17846,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -17739,6 +17863,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -17769,6 +17897,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -17777,6 +17909,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -17865,6 +18001,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -17897,6 +18037,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -18003,7 +18147,7 @@ definitions:
       subscription-service:
         description: "none"
         $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
-  tapi.oam.ConnectionEndPointAugmentation2:
+  tapi.oam.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
       mep-mip-list:
@@ -18012,7 +18156,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-oam"
       namespace: "urn:onf:otcc:yang:tapi-oam"
-  tapi.oam.ContextAugmentation2:
+  tapi.oam.ContextAugmentation1:
     type: "object"
     properties:
       oam-context:
@@ -18101,6 +18245,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid"
+  tapi.oam.MegRefWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.MegRef"
   tapi.oam.Mep:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -18135,6 +18283,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepMipListWrapper:
+    properties:
+      tapi-oam:mep-mip-list:
+        $ref: "#/definitions/tapi.oam.MepMipList"
   tapi.oam.MepRef:
     allOf:
     - $ref: "#/definitions/tapi.oam.MegRef"
@@ -18145,6 +18297,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MepRefWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.MepRef"
   tapi.oam.Mip:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -18164,6 +18320,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MipRefWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.MipRef"
   tapi.oam.OamConstraint:
     type: "object"
     properties:
@@ -18200,6 +18360,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.Meg"
+  tapi.oam.OamContextWrapper:
+    properties:
+      tapi-oam:oam-context:
+        $ref: "#/definitions/tapi.oam.OamContext"
   tapi.oam.OamJob:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -18233,6 +18397,10 @@ definitions:
           type: "string"
           description: "none"
       description: "none"
+  tapi.oam.OamJobWrapper:
+    properties:
+      oam-job:
+        $ref: "#/definitions/tapi.oam.OamJob"
   tapi.oam.OamProfile:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -18256,6 +18424,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid"
+  tapi.oam.OamProfileRefWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfileRef"
+  tapi.oam.OamProfileWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfile"
   tapi.oam.OamService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -18324,6 +18500,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id"
       description: "none"
+  tapi.oam.OamServiceEndPointRefWrapper:
+    properties:
+      oam-service-end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+  tapi.oam.OamServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
   tapi.oam.OamServiceRef:
     type: "object"
     properties:
@@ -18331,6 +18515,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid"
+  tapi.oam.OamServiceWrapper:
+    properties:
+      oam-service:
+        $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.PmBinData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -18340,6 +18528,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmBinDataWrapper:
+    properties:
+      pm-bin-data:
+        $ref: "#/definitions/tapi.oam.PmBinData"
   tapi.oam.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -18379,6 +18571,10 @@ definitions:
             \ hour in case of a 15 minute interval and bound to the hour in case of\
             \ a 24 hour interval."
       description: "none"
+  tapi.oam.PmCurrentDataWrapper:
+    properties:
+      pm-current-data:
+        $ref: "#/definitions/tapi.oam.PmCurrentData"
   tapi.oam.PmHistoryData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -18396,6 +18592,10 @@ definitions:
             \ be reliable."
           default: false
       description: "none"
+  tapi.oam.PmHistoryDataWrapper:
+    properties:
+      pm-history-data:
+        $ref: "#/definitions/tapi.oam.PmHistoryData"
   tapi.oam.PmThresholdData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -18409,6 +18609,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmThresholdDataWrapper:
+    properties:
+      pm-threshold-data:
+        $ref: "#/definitions/tapi.oam.PmThresholdData"
   tapi.oam.UpdateOamJob:
     type: "object"
     properties:
@@ -18589,10 +18793,18 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.oam.Mep"
     - $ref: "#/definitions/tapi.odu.MepAugmentation1"
+  tapi.oam.meg.MepWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.meg.Mep"
   tapi.oam.meg.Mip:
     allOf:
     - $ref: "#/definitions/tapi.oam.Mip"
     - $ref: "#/definitions/tapi.odu.MipAugmentation1"
+  tapi.oam.meg.MipWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.meg.Mip"
   tapi.oam.oamcontext.Meg:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -18626,6 +18838,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "none"
+  tapi.oam.oamcontext.MegWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.oamcontext.Meg"
   tapi.oam.updateoamjob.Input:
     type: "object"
     properties:
@@ -18688,7 +18904,7 @@ definitions:
       end-point:
         description: "none"
         $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
-  tapi.odu.ConnectionEndPointAugmentation1:
+  tapi.odu.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
       odu-connection-end-point-spec:
@@ -18715,6 +18931,10 @@ definitions:
     enum:
     - "PERCENTAGE"
     - "NUMBER_ERRORED_BLOCKS"
+  tapi.odu.DegThrWrapper:
+    properties:
+      deg-thr:
+        $ref: "#/definitions/tapi.odu.DegThr"
   tapi.odu.EndPointAugmentation1:
     type: "object"
     properties:
@@ -18751,6 +18971,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "counter: bit error rate after correction by FEC"
+  tapi.odu.FecPropertiesWrapper:
+    properties:
+      fec-parameters:
+        $ref: "#/definitions/tapi.odu.FecProperties"
   tapi.odu.MappingType:
     type: "string"
     enum:
@@ -18812,6 +19036,10 @@ definitions:
       odu-type:
         type: "string"
         description: "This attribute specifies the type of the ODU termination point."
+  tapi.odu.OduCommonPacWrapper:
+    properties:
+      odu-common:
+        $ref: "#/definitions/tapi.odu.OduCommonPac"
   tapi.odu.OduConnectionEndPointSpec:
     type: "object"
     properties:
@@ -18827,6 +19055,10 @@ definitions:
       odu-protection:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduProtectionPac"
+  tapi.odu.OduConnectionEndPointSpecWrapper:
+    properties:
+      tapi-odu:odu-connection-end-point-spec:
+        $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
   tapi.odu.OduConnectivityServiceEndPointSpec:
     type: "object"
     properties:
@@ -18839,6 +19071,10 @@ definitions:
       odu-csep-ttp-pac:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+  tapi.odu.OduConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-odu:odu-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
   tapi.odu.OduCsepCommonPac:
     type: "object"
     properties:
@@ -18871,6 +19107,10 @@ definitions:
       odu-type:
         type: "string"
         description: "This attribute specifies the type of the ODU termination point."
+  tapi.odu.OduCsepCommonPacWrapper:
+    properties:
+      odu-csep-common-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
   tapi.odu.OduCsepCtpPac:
     type: "object"
     properties:
@@ -18931,6 +19171,10 @@ definitions:
           \n                In case of ODUk mapping over ODUCn, the TPN is encoded\
           \ in a 14-bit field so the value range is 0-16383. See clause 20.4.1.1/G.709-2016.\r\
           \n                "
+  tapi.odu.OduCsepCtpPacWrapper:
+    properties:
+      odu-csep-ctp-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
   tapi.odu.OduCsepTtpPac:
     type: "object"
     properties:
@@ -18941,6 +19185,10 @@ definitions:
         type: "string"
         description: "This attribute configures the type of the client CTP of the\
           \ server ODU TTP."
+  tapi.odu.OduCsepTtpPacWrapper:
+    properties:
+      odu-csep-ttp-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
   tapi.odu.OduCtpPac:
     type: "object"
     properties:
@@ -19009,6 +19257,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.odu.OduCtpPacWrapper:
+    properties:
+      odu-ctp:
+        $ref: "#/definitions/tapi.odu.OduCtpPac"
   tapi.odu.OduDefectPac:
     type: "object"
     properties:
@@ -19036,6 +19288,10 @@ definitions:
         type: "boolean"
         description: "Trail Trace Identifier Mismatch"
         default: false
+  tapi.odu.OduDefectPacWrapper:
+    properties:
+      odu-defect:
+        $ref: "#/definitions/tapi.odu.OduDefectPac"
   tapi.odu.OduMipPac:
     type: "object"
     properties:
@@ -19081,6 +19337,10 @@ definitions:
           \ system to enable or disable the Consequent Action function when detecting\
           \ Trace Identifier Mismatch (TIM) at the trail termination sink."
         default: true
+  tapi.odu.OduMipPacWrapper:
+    properties:
+      odu-mip:
+        $ref: "#/definitions/tapi.odu.OduMipPac"
   tapi.odu.OduMipSpec:
     type: "object"
     properties:
@@ -19099,6 +19359,10 @@ definitions:
       odu-defect:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduDefectPac"
+  tapi.odu.OduMipSpecWrapper:
+    properties:
+      tapi-odu:odu-mip-spec:
+        $ref: "#/definitions/tapi.odu.OduMipSpec"
   tapi.odu.OduNamedPayloadType:
     type: "string"
     enum:
@@ -19113,12 +19377,20 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.odu.OduNcmPacWrapper:
+    properties:
+      odu-ncm:
+        $ref: "#/definitions/tapi.odu.OduNcmPac"
   tapi.odu.OduNodeEdgePointSpec:
     type: "object"
     properties:
       odu-pool:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduPoolPac"
+  tapi.odu.OduNodeEdgePointSpecWrapper:
+    properties:
+      tapi-odu:odu-node-edge-point-spec:
+        $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
   tapi.odu.OduPayloadType:
     type: "object"
     properties:
@@ -19129,6 +19401,10 @@ definitions:
       named-payload-type:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduNamedPayloadType"
+  tapi.odu.OduPayloadTypeWrapper:
+    properties:
+      accepted-payload-type:
+        $ref: "#/definitions/tapi.odu.OduPayloadType"
   tapi.odu.OduPmPac:
     type: "object"
     properties:
@@ -19151,6 +19427,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "Near-end Severely Errored Second"
+  tapi.odu.OduPmPacWrapper:
+    properties:
+      odu-pm:
+        $ref: "#/definitions/tapi.odu.OduPmPac"
   tapi.odu.OduPoolPac:
     type: "object"
     properties:
@@ -19166,6 +19446,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.odu.OduPoolPacWrapper:
+    properties:
+      odu-pool:
+        $ref: "#/definitions/tapi.odu.OduPoolPac"
   tapi.odu.OduProtectionPac:
     type: "object"
     properties:
@@ -19185,6 +19469,10 @@ definitions:
           \ triggers the MI_APS_LVL signal to the transport adaptation function. The\
           \ value 0 means path and the values 1 through 6 mean TCM level 1 through\
           \ 6 respectively."
+  tapi.odu.OduProtectionPacWrapper:
+    properties:
+      odu-protection:
+        $ref: "#/definitions/tapi.odu.OduProtectionPac"
   tapi.odu.OduSlotSize:
     type: "string"
     enum:
@@ -19198,6 +19486,10 @@ definitions:
         format: "int32"
         description: "This attribute indicates the tandem connection monitoring field\
           \ of the ODU OH."
+  tapi.odu.OduTcmMipPacWrapper:
+    properties:
+      odu-tcm:
+        $ref: "#/definitions/tapi.odu.OduTcmMipPac"
   tapi.odu.OduTerminationAndClientAdaptationPac:
     type: "object"
     properties:
@@ -19245,6 +19537,10 @@ definitions:
         type: "string"
         description: "This attribute configures the type of the client CTP of the\
           \ server ODU TTP."
+  tapi.odu.OduTerminationAndClientAdaptationPacWrapper:
+    properties:
+      odu-term-and-adapter:
+        $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
   tapi.odu.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
@@ -19288,6 +19584,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.odu.UasChoiceWrapper:
+    properties:
+      uas:
+        $ref: "#/definitions/tapi.odu.UasChoice"
   tapi.path.computation.ComputeP2PPath:
     type: "object"
     properties:
@@ -19356,6 +19656,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -19384,6 +19688,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -19405,6 +19713,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -19414,6 +19726,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -19421,6 +19737,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -19457,6 +19777,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -19509,6 +19837,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -19561,6 +19893,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -19572,6 +19908,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -19641,6 +19981,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
@@ -19664,6 +20008,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -19720,6 +20068,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -19746,6 +20098,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -19800,6 +20156,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -19811,6 +20175,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -19900,6 +20268,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -19955,6 +20327,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -19977,6 +20357,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -19997,6 +20381,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -20022,6 +20410,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -20136,6 +20528,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -20155,6 +20551,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -20192,6 +20592,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -20199,6 +20603,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -20264,6 +20676,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -20346,6 +20762,10 @@ definitions:
     - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation2"
     - $ref: "#/definitions/tapi.odu.OwnedNodeEdgePointAugmentation1"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -20380,3 +20800,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
diff --git a/OAS/tapi-path-computation@2020-04-23.yaml b/OAS/tapi-path-computation@2020-04-23.yaml
index 9073664d..3ab9abc5 100644
--- a/OAS/tapi-path-computation@2020-04-23.yaml
+++ b/OAS/tapi-path-computation@2020-04-23.yaml
@@ -1,41 +1,41 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Topology Model definitions.\r\
-    \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -69,15 +69,15 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
-  title: "tapi-topology,tapi-notification,tapi-common,tapi-path-computation API"
+  version: "2.1.3"
+  title: "tapi-notification,tapi-topology,tapi-common,tapi-path-computation API"
 host: "localhost:1234"
 consumes:
 - "application/yang-data+json"
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -88,7 +88,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -102,7 +102,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -121,7 +121,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -140,7 +140,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/name/:
     post:
       tags:
       - "tapi-common"
@@ -154,7 +154,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -162,7 +162,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -180,7 +180,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -201,7 +201,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -227,32 +227,19 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.notification.NotificationContext"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -260,18 +247,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePoint"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -281,100 +292,158 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationSubscriptionService"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
     post:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -382,7 +451,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
@@ -390,7 +459,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -398,10 +467,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -409,7 +478,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -421,12 +490,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -434,7 +503,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -447,7 +516,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -457,7 +526,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -465,7 +534,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -478,277 +547,218 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
-        required: true
-        type: "string"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+    post:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
-      description: "none"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
-        200:
-          description: "tapi.notification.SubscriptionFilter"
-          schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -756,10 +766,29 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NotificationSubscriptionService"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -768,11 +797,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -783,7 +813,7 @@ paths:
     delete:
       tags:
       - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -796,7 +826,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -815,7 +845,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -823,7 +853,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -846,7 +876,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -872,7 +902,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -903,102 +933,172 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      summary: "returns tapi.notification.NotificationChannel"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "none"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of additional-info"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
+      summary: "returns tapi.notification.AlarmInfo"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.AlarmInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -1012,17 +1112,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -1036,17 +1141,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
@@ -1055,36 +1165,45 @@ paths:
         200:
           description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathComputationContext"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added to\
-          \ list"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -1094,17 +1213,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added or\
-          \ updated"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -1114,29 +1237,40 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationService"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added to\
-          \ list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1144,43 +1278,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationService"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathComputationService"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationService"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added or\
-          \ updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1190,13 +1337,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationService"
-      description: "none"
+      - "tapi-notification"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -1204,151 +1358,188 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathServiceEndPoint"
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.Notification"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathServiceEndPoint"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathServiceEndPoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.AlarmInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathServiceEndPoint"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.Capacity"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.Capacity"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of target-object-name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
+      responses:
+        200:
+          description: "tapi.notification.TcaInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.path.computation.PathComputationContext"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters:
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -1359,7 +1550,60 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.Capacity"
+      summary: "creates or updates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathComputationService"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathComputationService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1367,17 +1611,31 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.path.computation.PathComputationService"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathComputationService"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -1388,7 +1646,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.Capacity"
+      summary: "removes tapi.path.computation.PathComputationService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1396,21 +1654,16 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
-    get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.BandwidthProfile"
+      summary: "creates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1418,22 +1671,24 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+    get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.BandwidthProfile"
+      summary: "returns tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1446,23 +1701,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.PathServiceEndPoint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.BandwidthProfile"
+      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1476,11 +1725,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -1491,7 +1740,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.BandwidthProfile"
+      summary: "removes tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1509,11 +1758,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1528,15 +1777,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1550,11 +1799,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1565,7 +1814,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1579,11 +1828,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -1594,7 +1843,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1612,11 +1861,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1631,15 +1880,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -1653,11 +1902,114 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.BandwidthProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-path-computation"
+      summary: "removes tapi.common.BandwidthProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1686,7 +2038,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1715,7 +2067,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-path-computation"
@@ -1736,7 +2088,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1760,7 +2112,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1789,7 +2141,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1818,7 +2170,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-path-computation"
@@ -1839,7 +2191,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1863,7 +2215,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1892,7 +2244,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1921,8 +2273,111 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
@@ -1943,7 +2398,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -1968,7 +2423,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1998,7 +2453,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2028,7 +2483,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -2052,7 +2507,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2060,8 +2515,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -2088,7 +2543,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2119,7 +2574,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2155,8 +2610,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -2176,7 +2631,7 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -2200,7 +2655,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2229,7 +2684,7 @@ paths:
         description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -2258,7 +2713,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -2277,7 +2732,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2285,7 +2740,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -2308,7 +2763,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2334,7 +2789,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2365,7 +2820,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
     get:
       tags:
       - "tapi-path-computation"
@@ -2381,7 +2836,7 @@ paths:
         200:
           description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
@@ -2400,7 +2855,7 @@ paths:
         description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -2424,7 +2879,7 @@ paths:
         description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -2448,7 +2903,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -2467,7 +2922,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2475,8 +2930,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -2498,7 +2953,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2524,7 +2979,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2555,7 +3010,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
     get:
       tags:
       - "tapi-path-computation"
@@ -2571,7 +3026,7 @@ paths:
         200:
           description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
     post:
@@ -2591,7 +3046,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -2616,7 +3071,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -2640,7 +3095,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
     post:
       tags:
       - "tapi-path-computation"
@@ -2659,7 +3114,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2667,8 +3122,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
@@ -2690,7 +3145,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -2716,7 +3171,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -2747,7 +3202,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -2768,10 +3223,10 @@ paths:
         200:
           description: "tapi.path.computation.PathRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
     get:
       tags:
       - "tapi-path-computation"
@@ -2787,7 +3242,7 @@ paths:
         200:
           description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
@@ -2806,7 +3261,7 @@ paths:
         description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -2830,7 +3285,7 @@ paths:
         description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -2854,8 +3309,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
       summary: "creates tapi.topology.CostCharacteristic"
@@ -2872,7 +3327,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2880,8 +3335,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.topology.CostCharacteristic"
@@ -2902,7 +3357,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -2927,7 +3382,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2957,8 +3412,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
       summary: "creates tapi.topology.LatencyCharacteristic"
@@ -2975,7 +3430,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -2983,7 +3438,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-path-computation"
@@ -3005,7 +3460,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -3030,7 +3485,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3060,8 +3515,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.path.computation.ValueOrPriority"
@@ -3076,7 +3531,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3095,7 +3550,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3119,7 +3574,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3143,8 +3598,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.path.computation.ValueOrPriority"
@@ -3159,7 +3614,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3178,7 +3633,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3202,7 +3657,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3226,8 +3681,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
+  : get:
       tags:
       - "tapi-path-computation"
       summary: "returns tapi.path.computation.ValueOrPriority"
@@ -3242,7 +3697,7 @@ paths:
         200:
           description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
@@ -3261,7 +3716,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3285,7 +3740,7 @@ paths:
         description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3309,8 +3764,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
       - "tapi-path-computation"
       summary: "creates tapi.topology.RiskCharacteristic"
@@ -3326,7 +3781,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3334,7 +3789,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-path-computation"
@@ -3355,7 +3810,7 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -3379,7 +3834,7 @@ paths:
         description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -3408,7 +3863,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
     get:
       tags:
       - "tapi-path-computation"
@@ -3424,7 +3879,7 @@ paths:
         200:
           description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
     post:
@@ -3443,7 +3898,7 @@ paths:
         description: "tapi.path.computation.TopologyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -3467,7 +3922,7 @@ paths:
         description: "tapi.path.computation.TopologyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -3491,7 +3946,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -3507,10 +3962,10 @@ paths:
         200:
           description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
     get:
       tags:
       - "tapi-path-computation"
@@ -3530,499 +3985,27 @@ paths:
       - name: "link-uuid"
         in: "path"
         description: "Id of link"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePoint"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.Capacity"
-          schema:
-            $ref: "#/definitions/tapi.common.Capacity"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       - name: "value-name"
@@ -4031,146 +4014,163 @@ paths:
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -4181,7 +4181,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -4195,7 +4195,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4214,7 +4214,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -4233,7 +4233,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -4244,10 +4244,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -4265,10 +4265,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -4284,10 +4284,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -4303,10 +4303,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -4327,10 +4327,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -4351,10 +4351,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -4375,11 +4375,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -4399,10 +4399,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4423,11 +4423,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -4447,11 +4447,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -4471,10 +4471,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -4496,10 +4496,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -4526,11 +4526,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -4556,10 +4556,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -4587,10 +4587,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4626,10 +4626,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -4650,11 +4650,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -4680,10 +4680,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -4705,11 +4705,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -4729,10 +4729,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4753,10 +4753,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4777,11 +4777,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -4801,10 +4801,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4825,10 +4825,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -4850,11 +4850,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -4880,10 +4880,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -4906,10 +4906,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -4930,10 +4930,10 @@ paths:
         200:
           description: "tapi.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.Node"
+            $ref: "#/definitions/tapi.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4969,10 +4969,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -4993,10 +4993,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -5017,11 +5017,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -5041,10 +5041,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5065,11 +5065,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -5089,11 +5089,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -5113,10 +5113,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -5138,10 +5138,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -5168,10 +5168,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -5192,11 +5192,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -5222,10 +5222,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -5253,11 +5253,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -5282,11 +5282,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -5311,10 +5311,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -5340,10 +5340,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5369,10 +5369,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5398,10 +5398,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5427,10 +5427,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5456,10 +5456,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5486,10 +5486,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5521,10 +5521,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -5557,10 +5557,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -5609,10 +5609,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -5643,10 +5643,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -5677,10 +5677,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5711,10 +5711,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5745,10 +5745,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5779,10 +5779,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5813,10 +5813,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5848,10 +5848,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5888,10 +5888,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5928,10 +5928,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -5969,10 +5969,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -6009,10 +6009,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -6048,10 +6048,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -6099,10 +6099,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -6140,10 +6140,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -6186,10 +6186,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -6227,10 +6227,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -6262,10 +6262,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -6296,10 +6296,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6330,10 +6330,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6364,10 +6364,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6398,10 +6398,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6432,10 +6432,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6467,10 +6467,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -6502,11 +6502,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -6538,10 +6538,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -6582,10 +6582,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -6628,10 +6628,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -6663,11 +6663,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -6697,10 +6697,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -6743,10 +6743,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -6779,10 +6779,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -6820,10 +6820,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -6856,10 +6856,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -6886,10 +6886,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -6915,10 +6915,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -6944,10 +6944,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -6973,10 +6973,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7002,10 +7002,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7031,10 +7031,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7061,11 +7061,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeEdgePoint"
@@ -7090,10 +7090,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -7134,10 +7134,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -7163,10 +7163,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -7192,10 +7192,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7221,10 +7221,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7250,10 +7250,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7279,10 +7279,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7308,10 +7308,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7338,10 +7338,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -7374,10 +7374,10 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -7410,10 +7410,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -7440,10 +7440,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -7469,10 +7469,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7498,10 +7498,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7527,10 +7527,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7556,10 +7556,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7585,10 +7585,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7615,10 +7615,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -7640,11 +7640,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -7664,10 +7664,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -7688,10 +7688,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7712,11 +7712,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -7736,10 +7736,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -7760,10 +7760,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -7785,171 +7785,112 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /operations/compute-p-2-p-path/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/create-notification-subscription-service/:
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
-        201:
-          description: "No response"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
       - "tapi-notification"
@@ -7972,7 +7913,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
       - "tapi-notification"
@@ -7995,7 +7936,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
       - "tapi-notification"
@@ -8009,155 +7950,214 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-notification"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-notification:update-notification-subscription-service/:
+    post:
+      tags:
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
       - "tapi-topology"
-      parameters: []
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-topology:get-topology-list/:
+    post:
+      tags:
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -8213,6 +8213,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -8256,12 +8260,24 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
     - $ref: "#/definitions/tapi.path.computation.ContextAugmentation2"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation3"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -8343,6 +8359,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -8394,6 +8414,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8483,6 +8511,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -8534,6 +8566,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8606,6 +8642,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -8619,6 +8659,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8649,6 +8693,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -8657,6 +8705,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -8745,6 +8797,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -8777,6 +8833,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -8951,6 +9011,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8979,6 +9043,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -9000,6 +9068,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -9009,6 +9081,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -9016,6 +9092,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -9052,6 +9132,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -9104,6 +9192,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -9156,6 +9248,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -9167,6 +9263,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -9236,6 +9336,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation3:
     type: "object"
     properties:
@@ -9259,6 +9363,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -9315,6 +9423,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -9341,6 +9453,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -9395,6 +9511,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -9406,6 +9530,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -9495,6 +9623,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+  tapi.topology.NodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePoint"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -9550,6 +9686,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+  tapi.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.Node"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -9572,6 +9720,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -9592,6 +9744,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -9617,6 +9773,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -9731,6 +9891,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -9750,6 +9914,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -9787,6 +9955,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -9794,6 +9966,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -9859,6 +10039,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
diff --git a/OAS/tapi-photonic-media@2020-04-23.yaml b/OAS/tapi-photonic-media@2020-06-16.yaml
similarity index 86%
rename from OAS/tapi-photonic-media@2020-04-23.yaml
rename to OAS/tapi-photonic-media@2020-06-16.yaml
index a117e14b..0384d566 100644
--- a/OAS/tapi-photonic-media@2020-04-23.yaml
+++ b/OAS/tapi-photonic-media@2020-06-16.yaml
@@ -1,29 +1,11 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Connectivity Model definitions.\r\
-    \n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
-    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
-    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
-    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
-    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
-    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
-    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Photonic Media\
-    \ Model definitions.\r\n        Source: TapiPhotonicMedia.uml\r\n        - The\
-    \ TAPI YANG models included in this TAPI release are a *normative* part of the\
-    \ TAPI SDK.\r\n        - The YANG specifications have been generated from the\
-    \ corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n    \
-    \      <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
     \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
@@ -70,7 +52,24 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
+    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
+    \n        - The YANG specifications have been generated from the corresponding\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
+    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
@@ -87,11 +86,12 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
-    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
-    \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Photonic Media\
+    \ Model definitions.\r\n        Source: TapiPhotonicMedia.uml\r\n        - The\
+    \ TAPI YANG models included in this TAPI release are a *normative* part of the\
+    \ TAPI SDK.\r\n        - The YANG specifications have been generated from the\
+    \ corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n    \
+    \      <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
     \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
@@ -155,8 +155,8 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0"
-  version: "2.2.0"
-  title: "tapi-connectivity,tapi-photonic-media,tapi-odu,tapi-oam,tapi-topology,tapi-notification,tapi-common,tapi-path-computation,tapi-dsr\
+  version: "2.1.3"
+  title: "tapi-notification,tapi-odu,tapi-oam,tapi-connectivity,tapi-topology,tapi-photonic-media,tapi-common,tapi-path-computation,tapi-dsr\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -164,7 +164,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -175,7 +175,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -189,7 +189,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -208,7 +208,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -227,32 +227,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.context.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -260,18 +249,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.context.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -281,234 +298,274 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.context.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.context.ServiceInterfacePoint.body-param"
+        description: "tapi.common.context.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.context.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.context.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.context.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.context.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.context.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - in: "body"
+        name: "tapi.common.context.ServiceInterfacePoint.body-param"
+        description: "tapi.common.context.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.context.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.context.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
-    get:
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -520,50 +577,51 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
-    get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ResilienceRoute"
-      description: "Provides optional resilience and state attributes to the Route."
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of route"
+        description: "Id of name"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.ResilienceRoute"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -572,321 +630,337 @@ paths:
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.LinkRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LinkRef"
+          description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControl"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
+          \ be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.SwitchControl"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
+          \ be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "switch-control-uuid"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelPoolCapabilityPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.ResilienceType"
+          description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControlRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "switch-control-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch-control"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of sub-switch-control"
-        required: true
-        type: "string"
-      - name: "sub-switch-control-switch-control-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of sub-switch-control"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.connectivity.SwitchControlRef"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Switch"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "switch-control-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch-control"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
-      - name: "local-id"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.connectivity.Switch"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
-      - name: "value-name"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of name"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
-      - name: "topology-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
-      - name: "node-uuid"
+        type: "integer"
+        format: "int32"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.RouteRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
-      - name: "connection-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of selected-route"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
-      - name: "route-local-id"
+        type: "integer"
+        format: "int32"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of selected-route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.RouteRef"
+          description: "tapi.photonic.media.PowerManagementCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
-        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
-          \ be added to list"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -894,43 +968,24 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.connectivitycontext.ConnectivityService"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.connectivity.connectivitycontext.ConnectivityService"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
-        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
-          \ be added or updated"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -940,13 +995,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -954,66 +1009,46 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityServiceRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1023,21 +1058,23 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1047,13 +1084,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1061,80 +1100,72 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1144,19 +1175,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1164,77 +1191,69 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connectivity-service-uuid"
-        in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectivityServiceRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connectivity-service-uuid"
-        in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1244,18 +1263,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connectivity-service-uuid"
-        in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1263,79 +1278,69 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
-        description: "tapi.connectivity.connectivityservice.EndPoint to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.connectivityservice.EndPoint"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
-        description: "tapi.connectivity.connectivityservice.EndPoint to be added or\
-          \ updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1345,18 +1350,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1364,52 +1365,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.photonic.media.OtsiServiceInterfacePointSpec"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -1419,26 +1411,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -1448,18 +1436,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1467,155 +1450,171 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
+  /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.photonic.media.OtsiCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.photonic.media.OtsiCapabilityPacWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/supportable-application-identifier={application-code}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "The list of supportable ApplicationIdentifiers."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "application-code"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supportable-application-identifier"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.ApplicationIdentifier"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/supportable-central-frequency-spectrum-band={lower-central-frequency},{upper-central-frequency}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequencyBand"
+      description: "Each spectrum band supported for otsi trasmitter to be tuned on,\r\
+        \n                is specified as per it's lower and upper central frequencies\
+        \ supported and its frequency constraints,\r\n                consisting in\
+        \ the frequency Grid and the AdjustmentGranularity,\r\n                used\
+        \ to uniquely identify all central frequencies supported within the band."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "lower-central-frequency"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supportable-central-frequency-spectrum-band"
         required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+        type: "integer"
+        format: "int32"
+      - name: "upper-central-frequency"
+        in: "path"
+        description: "Id of supportable-central-frequency-spectrum-band"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.CentralFrequencyBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyBandWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/supportable-central-frequency-spectrum-band={lower-central-frequency},{upper-central-frequency}/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.BandwidthProfile"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "lower-central-frequency"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supportable-central-frequency-spectrum-band"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
+      - name: "upper-central-frequency"
+        in: "path"
+        description: "Id of supportable-central-frequency-spectrum-band"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/total-power-warn-threshold/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.TotalPowerThresholdPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.photonic.media.TotalPowerThresholdPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerManagementCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -1625,26 +1624,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -1654,18 +1649,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1673,52 +1663,46 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1728,26 +1712,23 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1757,18 +1738,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1776,52 +1754,46 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1831,26 +1803,23 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1860,18 +1829,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1879,52 +1845,44 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1934,26 +1892,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1963,18 +1917,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1982,54 +1932,44 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -2039,27 +1979,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -2069,19 +2004,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -2089,205 +2019,167 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
-          \ to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
-          \ to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/capacity/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+    get:
       tags:
-      - "tapi-photonic-media"
+      - "tapi-common"
       summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityContext"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.connectivity.context.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -2297,28 +2189,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.connectivity.context.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -2328,187 +2208,221 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Connection"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of lower-connection"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConfigPac"
+          description: "tapi.connectivity.ConnectionRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Route"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
+        description: "Id of route"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name={value-name}/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-photonic-media"
+      - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2516,17 +2430,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
+        description: "Id of route"
         required: true
         type: "string"
       - name: "value-name"
@@ -2538,399 +2447,373 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ResilienceRoute"
+      description: "Provides optional resilience and state attributes to the Route."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of route"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ResilienceRoute"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supported-client-link"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "link-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of supported-client-link"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementConfigPac"
+          description: "tapi.topology.LinkRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.SwitchControl"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.SwitchControl"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of switch-control"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.topology.ResilienceType"
+          schema:
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-maximum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.SwitchControlRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of sub-switch-control"
+        required: true
+        type: "string"
+      - name: "sub-switch-control-switch-control-uuid"
+        in: "path"
+        description: "Id of sub-switch-control"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.SwitchControlRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Switch"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "local-id"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of switch"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.Switch"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-minimum-input-power/
-  : get:
-      tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
-      parameters:
-      - name: "uuid"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "node-edge-point-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.RouteRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of selected-route"
         required: true
         type: "string"
+      - name: "route-local-id"
+        in: "path"
+        description: "Id of selected-route"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.RouteRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
+      parameters:
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
+        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
+          \ be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -2938,35 +2821,43 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.connectivitycontext.ConnectivityService"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
+        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
+          \ be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -2976,92 +2867,80 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-maximum-output-power/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3071,33 +2950,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3107,168 +2974,176 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-minimum-output-power/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-    post:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ConnectivityServiceRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3276,27 +3151,28 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3304,22 +3180,35 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.connectivityservice.EndPoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
+        description: "tapi.connectivity.connectivityservice.EndPoint to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -3327,10 +3216,11 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.connectivityservice.EndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3343,17 +3233,36 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.connectivityservice.EndPoint"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.connectivityservice.EndPoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
+        description: "tapi.connectivity.connectivityservice.EndPoint to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -3363,8 +3272,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.connectivityservice.EndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3377,21 +3286,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/frequency-constraint/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3404,22 +3308,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3432,17 +3331,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3452,8 +3346,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3466,17 +3360,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3486,8 +3375,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3500,21 +3389,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3529,15 +3413,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3551,12 +3435,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
-          \ to be added to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3566,8 +3449,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3581,12 +3464,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
-          \ to be added or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3596,8 +3478,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3615,11 +3497,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3634,15 +3516,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConfigPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3656,11 +3538,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3670,8 +3552,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3685,11 +3567,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3699,8 +3581,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3718,14 +3600,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3737,27 +3617,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name={value-name}/
-  : get:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3769,25 +3640,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3799,17 +3669,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3819,11 +3684,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3835,21 +3698,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3864,15 +3722,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementConfigPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3886,12 +3744,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
-          \ list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3901,8 +3758,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3916,12 +3773,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
-          \ updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3931,8 +3787,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3950,14 +3806,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-maximum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3971,18 +3825,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3995,11 +3847,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4009,11 +3861,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4026,11 +3876,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4040,11 +3890,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4061,14 +3909,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-minimum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4082,18 +3929,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4106,11 +3952,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4120,11 +3966,10 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4137,11 +3982,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4151,11 +3996,10 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4172,14 +4016,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-maximum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4191,20 +4033,41 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4217,11 +4080,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4229,13 +4092,44 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4247,12 +4141,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4262,11 +4161,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4278,19 +4177,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-minimum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4304,18 +4206,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4328,11 +4228,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4342,11 +4243,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4359,11 +4258,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4373,11 +4273,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4394,11 +4292,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4413,15 +4311,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4435,11 +4333,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4449,8 +4348,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4464,11 +4363,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4478,8 +4378,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4497,11 +4397,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4516,15 +4416,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4538,11 +4438,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4552,8 +4453,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4567,11 +4468,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4581,8 +4483,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4600,11 +4502,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4619,15 +4521,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementConfigPac"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4641,12 +4543,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
-          \ list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4656,8 +4557,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4671,12 +4572,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
-          \ updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4686,8 +4586,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4705,14 +4605,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-maximum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4726,18 +4624,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4750,11 +4646,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -4764,11 +4660,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4781,11 +4675,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -4795,11 +4689,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4816,14 +4708,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-minimum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-common-pac/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4837,18 +4727,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduCsepCommonPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4861,11 +4749,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -4875,11 +4763,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4892,11 +4778,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -4906,11 +4792,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4927,14 +4811,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-maximum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4948,18 +4830,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduCsepCtpPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4972,11 +4852,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -4986,11 +4866,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5003,11 +4881,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5017,11 +4895,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5038,14 +4914,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-minimum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5059,18 +4933,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduCsepTtpPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5083,11 +4955,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5097,11 +4969,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5114,11 +4984,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5128,11 +4998,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5149,14 +5017,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5168,27 +5034,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5200,25 +5057,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.McaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.McaConnectivityServiceEndPointSpec to be\
+          \ added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5230,17 +5087,13 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.McaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.McaConnectivityServiceEndPointSpec to be\
+          \ added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -5250,11 +5103,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5266,22 +5117,19 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/capacity/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5295,16 +5143,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5317,11 +5167,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5331,9 +5181,11 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5346,11 +5198,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5360,9 +5212,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5379,11 +5233,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
-  : get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config/
+  : post:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5396,17 +5250,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
-        200:
-          description: "tapi.odu.OduCsepCommonPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5419,23 +5280,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.MediaChannelConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5448,12 +5308,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5463,8 +5328,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5477,17 +5342,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
-  : get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/name/
+  : post:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5499,18 +5371,32 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.odu.OduCsepCtpPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/name={value-name}/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5522,24 +5408,30 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5551,12 +5443,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5566,9 +5468,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5580,16 +5484,26 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5602,17 +5516,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepTtpPac"
+          description: "tapi.photonic.media.PowerManagementConfigPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5625,12 +5544,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5640,8 +5565,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5654,12 +5579,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5669,8 +5600,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5683,17 +5614,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-maximum-input-power/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5705,18 +5643,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5728,13 +5673,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
-          \ be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5745,8 +5694,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5758,13 +5709,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
-          \ be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5775,8 +5730,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5788,17 +5745,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-minimum-input-power/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5810,26 +5774,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
-        400:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
+        400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/
-  : get:
+    post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5841,23 +5804,31 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.OtsiTerminationConfigPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5869,18 +5840,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
-          \ updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5891,8 +5861,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5904,9 +5876,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -5914,12 +5886,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/application-identifier/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-maximum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5931,23 +5905,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.ApplicationIdentifier"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5959,17 +5935,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5980,8 +5956,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5993,17 +5971,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6014,8 +5992,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6027,9 +6007,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6037,13 +6017,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-minimum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6055,24 +6036,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.CentralFrequency"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6084,17 +6066,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6105,9 +6087,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6119,17 +6102,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6140,9 +6123,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6154,9 +6138,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6164,11 +6148,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6181,22 +6165,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6209,17 +6193,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -6230,7 +6214,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6243,17 +6227,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -6264,7 +6248,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      summary: "removes tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6277,9 +6261,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6287,14 +6271,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/frequency-constraint/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6306,17 +6288,45 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -6324,14 +6334,11 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name={value-name}/
-  : get:
+    put:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6343,57 +6350,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -6404,10 +6371,8 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6419,14 +6384,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6434,11 +6394,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6451,22 +6411,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6479,17 +6434,13 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -6500,7 +6451,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6513,17 +6464,13 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -6534,7 +6481,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6547,21 +6494,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6574,22 +6516,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.MediaChannelConfigPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6602,17 +6539,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6623,7 +6555,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6636,17 +6568,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6657,7 +6584,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6670,22 +6597,19 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/transmit-power/
-  : get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/name/
+  : post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6697,23 +6621,27 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/name={value-name}/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6725,29 +6653,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6759,17 +6683,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6780,8 +6704,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6793,9 +6719,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -6803,11 +6729,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6822,15 +6748,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.PowerManagementConfigPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6844,12 +6770,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
-          \ added to list"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6860,7 +6786,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6874,12 +6800,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
-          \ added or updated"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6890,7 +6816,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6908,12 +6834,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-maximum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6927,16 +6855,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiTerminationConfigPac"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6949,12 +6879,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
-          \ list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6965,8 +6894,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6979,12 +6910,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
-          \ updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6995,8 +6925,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7013,12 +6945,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/application-identifier/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-minimum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7032,16 +6966,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.ApplicationIdentifier"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7054,11 +6990,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7069,8 +7005,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7083,11 +7021,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7098,8 +7036,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7116,13 +7056,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-maximum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7136,17 +7077,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.CentralFrequency"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7159,11 +7101,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7174,9 +7116,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7189,11 +7132,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7204,9 +7147,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7223,12 +7167,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-minimum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7242,16 +7188,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7264,11 +7212,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7279,8 +7227,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7293,11 +7243,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7308,8 +7258,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7326,14 +7278,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7345,27 +7295,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name={value-name}/
-  : get:
+    post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7377,25 +7318,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7407,17 +7347,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -7428,10 +7363,8 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7443,21 +7376,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/spectrum/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7472,15 +7400,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7494,11 +7422,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -7509,7 +7437,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7523,11 +7451,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -7538,7 +7466,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7556,11 +7484,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7575,15 +7503,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7597,11 +7525,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
+          \ added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -7612,7 +7541,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates or updates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7626,11 +7555,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
+          \ added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -7641,7 +7571,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      summary: "removes tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7659,12 +7589,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/transmit-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7678,16 +7608,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
+          description: "tapi.photonic.media.OtsiTerminationConfigPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7700,11 +7630,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
-        required: false
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
+          \ list"
+        required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -7715,8 +7646,8 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7729,11 +7660,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -7744,8 +7676,8 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7762,12 +7694,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/application-identifier/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7781,16 +7713,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.photonic.media.ApplicationIdentifier"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7803,12 +7735,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -7818,9 +7749,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7833,12 +7764,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -7848,9 +7778,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7867,12 +7797,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7886,16 +7817,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.photonic.media.CentralFrequency"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7908,12 +7840,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -7923,9 +7854,10 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7938,12 +7870,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -7953,9 +7884,10 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7972,11 +7904,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7991,15 +7923,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8013,12 +7945,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8028,8 +7959,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8043,12 +7974,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8058,8 +7988,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8077,12 +8007,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/name/
+  : post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8094,18 +8026,27 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/name={value-name}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8117,24 +8058,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8146,12 +8088,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8161,9 +8108,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8175,85 +8124,91 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/spectrum/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -8263,19 +8218,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -8283,11 +8237,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/spectrum/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8295,17 +8249,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8313,12 +8272,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8328,8 +8292,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8337,12 +8301,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8352,8 +8321,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8361,47 +8330,62 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/transmit-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8411,21 +8395,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8435,25 +8424,30 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8461,17 +8455,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8479,12 +8478,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec to\
+          \ be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -8494,8 +8499,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8503,12 +8508,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec to\
+          \ be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -8518,8 +8529,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8527,31 +8538,40 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config/
+  : post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8559,56 +8579,63 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.photonic.media.OtsiTerminationConfigPac"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8618,20 +8645,23 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       responses:
@@ -8639,42 +8669,62 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/application-identifier/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.photonic.media.ApplicationIdentifier"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -8684,21 +8734,31 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -8708,56 +8768,88 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.photonic.media.CentralFrequency"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -8767,21 +8859,32 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -8791,25 +8894,36 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8817,17 +8931,27 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8835,12 +8959,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8850,8 +8984,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8859,12 +8993,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8874,8 +9018,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8883,47 +9027,51 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name/
+  : post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8931,23 +9079,76 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8957,25 +9158,42 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8983,17 +9201,27 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9001,12 +9229,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -9016,8 +9254,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9025,12 +9263,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -9040,8 +9288,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9049,16 +9297,26 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9066,17 +9324,27 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9084,12 +9352,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9099,8 +9377,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9108,12 +9386,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9123,8 +9411,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9132,49 +9420,77 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/transmit-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -9184,22 +9500,31 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -9209,81 +9534,104 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
-    get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
-      description: "none"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.topology.ResilienceType"
-          schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.ResilienceType"
-      description: "none"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.ResilienceType.body-param"
-        description: "tapi.topology.ResilienceType to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LatencyCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.ResilienceType"
-      description: "none"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.topology.ResilienceType.body-param"
-        description: "tapi.topology.ResilienceType to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9294,24 +9642,30 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.ResilienceType"
-      description: "none"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.RiskCharacteristic"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9319,24 +9673,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.ValueOrPriority"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9344,22 +9691,23 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9367,17 +9715,12 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9388,7 +9731,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.RiskCharacteristic"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9396,22 +9739,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.TimeRange"
-      description: "none"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9420,16 +9758,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimeRange"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.TimeRange"
-      description: "none"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9437,11 +9775,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9452,8 +9790,8 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.TimeRange"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9461,11 +9799,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9476,8 +9814,8 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.TimeRange"
-      description: "none"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9489,21 +9827,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.ValueOrPriority"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
+        400:
+          description: "Internal error"
     post:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9511,15 +9870,87 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
-    get:
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9529,17 +9960,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-connectivity"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9550,7 +9986,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9560,12 +9996,17 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-connectivity"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9576,32 +10017,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-connectivity"
+      summary: "returns tapi.common.Capacity"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationContext"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.Capacity"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9611,16 +10062,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.Capacity"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9630,73 +10086,80 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-connectivity"
+      summary: "removes tapi.common.Capacity"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
-        200:
-          description: "tapi.notification.NotificationSubscriptionService"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -9706,13 +10169,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -9720,26 +10183,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9747,56 +10226,23 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
-    get:
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9806,20 +10252,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -9827,1235 +10266,149 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.NotificationChannel"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.notification.AlarmInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.NameAndValueChange"
-          schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.SubscriptionFilter"
-          schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.Notification"
-          schema:
-            $ref: "#/definitions/tapi.notification.Notification"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.AlarmInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.NameAndValueChange"
-          schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.oam.OamContext"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamContext"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.context.OamContext.body-param"
-        description: "tapi.oam.OamContext to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.context.OamContext.body-param"
-        description: "tapi.oam.OamContext to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/meg={uuid}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.oamcontext.Meg"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.oam.oamcontext.Meg"
-          schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.Meg"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.meg.Mep"
-      description: "1. ME may have 0 MEPs (case of transit domains where at least\
-        \ 1 MIP is present)\r\n                2. ME may have 1 MEP (case of edge\
-        \ domaind, where the peer MEP is ouside the managed domain)\r\n          \
-        \      3. ME may have 2 MEPs"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.oam.meg.Mep"
-          schema:
-            $ref: "#/definitions/tapi.oam.meg.Mep"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectionEndPointSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduConnectionEndPointSpec"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-common/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduCommonPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCommonPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-ctp/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCtpPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduCtpPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCtpPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-protection/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduProtectionPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduProtectionPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduProtectionPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPayloadType"
-      description: "This attribute is applicable when the ODU CTP object instance\
-        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
-        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
-        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
-        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
-        \ G.709 with one additional value UN_INTERPRETABLE."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduPayloadType"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduPayloadType"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.FecProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.FecProperties"
-          schema:
-            $ref: "#/definitions/tapi.odu.FecProperties"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.meg.Mip"
-      description: "ME may 0, 1, or more MIPs"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.oam.meg.Mip"
-          schema:
-            $ref: "#/definitions/tapi.oam.meg.Mip"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduMipSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduMipSpec"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduMipSpec"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-defect/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduDefectPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduDefectPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduDefectPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-mip/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduMipPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduMipPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduMipPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-mip/deg-thr/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.DegThr"
-      description: "This attribute indicates the threshold level for declaring a performance\
-        \ monitoring (PM) Second to be bad. The value of the threshold can be provisioned\
-        \ in terms of number of errored blocks or in terms of percentage of errored\
-        \ blocks. For percentage-based specification, in order to support provision\
-        \ of less than 1%, the specification consists of two fields. The first field\
-        \ indicates the granularity of percentage. For examples, in 1%, in 0.1%, or\
-        \ in 0.01%, etc. The second field indicates the multiple of the granularity.\
-        \ For number of errored block based, the value is a positive integer."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.DegThr"
-          schema:
-            $ref: "#/definitions/tapi.odu.DegThr"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-ncm/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduNcmPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduNcmPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduNcmPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-pm/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPmPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduPmPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduPmPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-pm/uas/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.UasChoice"
-      description: "UnAvailable Second"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.UasChoice"
-          schema:
-            $ref: "#/definitions/tapi.odu.UasChoice"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-tcm/:
-    get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduTcmMipPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mip"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduTcmMipPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduTcmMipPac"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/oam-job/:
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamJob"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.OamJob.body-param"
-        description: "tapi.oam.OamJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamJob"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.oam.OamJob"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamJob"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamJob"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamJob.body-param"
-        description: "tapi.oam.OamJob to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamJob"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11065,13 +10418,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamJob"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -11079,83 +10432,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11165,20 +10501,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -11186,42 +10515,44 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.OamProfileRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11231,21 +10562,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11255,13 +10587,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -11269,87 +10602,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamServiceEndPointRef"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.OamServiceEndPointRef.body-param"
-        description: "tapi.oam.OamServiceEndPointRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.ResilienceType"
+          schema:
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamServiceEndPointRef"
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "oam-service-uuid"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
-      - name: "oam-service-end-point-local-id"
-        in: "path"
-        description: "Id of oam-service-end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.ResilienceType.body-param"
+        description: "tapi.topology.ResilienceType to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
-        200:
-          description: "tapi.oam.OamServiceEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamServiceEndPointRef"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "oam-service-uuid"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
-      - name: "oam-service-end-point-local-id"
-        in: "path"
-        description: "Id of oam-service-end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamServiceEndPointRef.body-param"
-        description: "tapi.oam.OamServiceEndPointRef to be added or updated"
+        name: "tapi.topology.ResilienceType.body-param"
+        description: "tapi.topology.ResilienceType to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -11359,23 +10671,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamServiceEndPointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "oam-service-uuid"
-        in: "path"
-        description: "Id of oam-service-end-point"
-        required: true
-        type: "string"
-      - name: "oam-service-end-point-local-id"
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.ResilienceType"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of oam-service-end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -11383,275 +10685,214 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/:
-    get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.PmCurrentData"
-      description: "Granularity period of the CurrentData identifies the specific\
-        \ CurrentData instance in the scope of this OamJob.\r\n                For\
-        \ example, typically at least\r\n                one 15min and\r\n       \
-        \         one 24hr;\r\n                optionally one additional configurable\
-        \ (< 15min)"
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.oam.PmCurrentData"
-          schema:
-            $ref: "#/definitions/tapi.oam.PmCurrentData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
-    get:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimeInterval"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimeInterval"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.TimeInterval"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
-    get:
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "unit"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of period"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.RiskCharacteristic"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.TimeRange"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.PmHistoryData"
-      description: "in case of 24hr Current Data, at least 1 History Data.\r\n   \
-        \             In case of 15min Current Data, at least 16 History Data.\r\n\
-        \                In case of <15min, the number of History Data shall be able\
-        \ to cover a span of 4 hours."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.TimeRange"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
-        200:
-          description: "tapi.oam.PmHistoryData"
-          schema:
-            $ref: "#/definitions/tapi.oam.PmHistoryData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.TimeRange"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/schedule/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimeRange"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.common.TimeRange"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimeRange"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added to list"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -11661,21 +10902,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimeRange"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added or updated"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -11685,33 +10921,29 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimeRange"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamProfile"
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - in: "body"
-        name: "tapi.oam.OamProfile.body-param"
-        description: "tapi.oam.OamProfile to be added to list"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -11719,42 +10951,43 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamProfile"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.OamProfile"
+          description: "tapi.notification.NotificationSubscriptionService"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfile"
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamProfile"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfile.body-param"
-        description: "tapi.oam.OamProfile to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfile"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -11764,13 +10997,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamProfile"
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
@@ -11778,10 +11011,10 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -11789,7 +11022,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
@@ -11797,7 +11030,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11805,10 +11038,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -11816,7 +11049,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -11828,12 +11061,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -11841,7 +11074,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -11854,7 +11087,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11864,7 +11097,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -11872,7 +11105,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -11885,480 +11118,277 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data/:
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.PmBinData"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.oam.PmBinData.body-param"
-        description: "tapi.oam.PmBinData to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.PmBinData"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.oam.PmBinData"
-          schema:
-            $ref: "#/definitions/tapi.oam.PmBinData"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.PmBinData"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.oam.PmBinData.body-param"
-        description: "tapi.oam.PmBinData to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.PmBinData"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationChannel"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimePeriod"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimePeriod"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimePeriod"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
-      responses:
-        201:
-          description: "Object created"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimePeriod"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.Notification"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.AlarmInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data/:
-    post:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.PmThresholdData"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.PmThresholdData.body-param"
-        description: "tapi.oam.PmThresholdData to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.PmThresholdData"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notification"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.PmThresholdData"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.PmThresholdData"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.PmThresholdData"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.PmThresholdData.body-param"
-        description: "tapi.oam.PmThresholdData to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.PmThresholdData"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.PmThresholdData"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.TcaInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimePeriod"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimePeriod"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added to list"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -12368,26 +11398,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimePeriod"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added or updated"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -12397,18 +11422,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimePeriod"
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
@@ -12416,10 +11436,10 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -12427,12 +11447,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
@@ -12440,7 +11455,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12448,10 +11463,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -12459,12 +11474,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -12476,12 +11486,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -12489,12 +11499,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -12507,7 +11512,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12517,7 +11522,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
+      - "tapi-notification"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -12525,12 +11530,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -12543,62 +11543,206 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service/:
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamService"
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.oam.OamService.body-param"
-        description: "tapi.oam.OamService to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.Notification"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamService"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.OamService"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.OamService"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamService"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.AlarmInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
+      responses:
+        200:
+          description: "tapi.notification.TcaInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.oam.OamContext"
+          schema:
+            $ref: "#/definitions/tapi.oam.OamContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
+      parameters:
       - in: "body"
-        name: "tapi.oam.OamService.body-param"
-        description: "tapi.oam.OamService to be added or updated"
+        name: "tapi.oam.context.OamContext.body-param"
+        description: "tapi.oam.OamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamService"
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.context.OamContext.body-param"
+        description: "tapi.oam.OamContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -12609,540 +11753,557 @@ paths:
     delete:
       tags:
       - "tapi-oam"
-      summary: "removes tapi.oam.OamService"
+      summary: "removes tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.oamcontext.Meg"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.oamcontext.Meg"
+          schema:
+            $ref: "#/definitions/tapi.oam.oamcontext.MegWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.meg.Mep"
+      description: "1. ME may have 0 MEPs (case of transit domains where at least\
+        \ 1 MIP is present)\r\n                2. ME may have 1 MEP (case of edge\
+        \ domaind, where the peer MEP is ouside the managed domain)\r\n          \
+        \      3. ME may have 2 MEPs"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.oam.meg.Mep"
+          schema:
+            $ref: "#/definitions/tapi.oam.meg.MepWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point/:
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+    get:
       tags:
       - "tapi-oam"
-      summary: "creates tapi.oam.OamServiceEndPoint"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.OamServiceEndPoint.body-param"
-        description: "tapi.oam.OamServiceEndPoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamServiceEndPoint"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.OamServiceEndPoint"
+          description: "tapi.odu.OduConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-common/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamServiceEndPoint"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.OamServiceEndPoint.body-param"
-        description: "tapi.oam.OamServiceEndPoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduCommonPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCommonPacWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-ctp/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamServiceEndPoint"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.odu.OduCtpPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCtpPacWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-protection/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduProtectionPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.odu.OduProtectionPac"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.odu.OduProtectionPacWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPacWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPayloadType"
+      description: "This attribute is applicable when the ODU CTP object instance\
+        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
+        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
+        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
+        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
+        \ G.709 with one additional value UN_INTERPRETABLE."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduPayloadType"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduPayloadTypeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.FecProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.odu.FecProperties"
+          schema:
+            $ref: "#/definitions/tapi.odu.FecPropertiesWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
-      description: "none"
+      summary: "returns tapi.oam.meg.Mip"
+      description: "ME may 0, 1, or more MIPs"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.oam.meg.Mip"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.oam.meg.MipWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MipRef"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name/:
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduMipSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduMipSpec"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduMipSpecWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-defect/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduDefectPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.odu.OduDefectPac"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.odu.OduDefectPacWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-mip/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduMipPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of mip"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduMipPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduMipPacWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-mip/deg-thr/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.DegThr"
+      description: "This attribute indicates the threshold level for declaring a performance\
+        \ monitoring (PM) Second to be bad. The value of the threshold can be provisioned\
+        \ in terms of number of errored blocks or in terms of percentage of errored\
+        \ blocks. For percentage-based specification, in order to support provision\
+        \ of less than 1%, the specification consists of two fields. The first field\
+        \ indicates the granularity of percentage. For examples, in 1%, in 0.1%, or\
+        \ in 0.01%, etc. The second field indicates the multiple of the granularity.\
+        \ For number of errored block based, the value is a positive integer."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.odu.DegThr"
+          schema:
+            $ref: "#/definitions/tapi.odu.DegThrWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-ncm/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduNcmPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.odu.OduNcmPac"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.odu.OduNcmPacWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-pm/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPmPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduPmPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduPmPacWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-pm/uas/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-odu"
+      summary: "returns tapi.odu.UasChoice"
+      description: "UnAvailable Second"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.UasChoice"
+          schema:
+            $ref: "#/definitions/tapi.odu.UasChoiceWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-tcm/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTcmMipPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of mip"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.odu.OduTcmMipPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduTcmMipPacWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/meg/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.MegRef"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MegRef"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.MegRef"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job/:
     post:
       tags:
       - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.oam.OamJob"
+      description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-service"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.oam.OamJob.body-param"
+        description: "tapi.oam.OamJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -13150,56 +12311,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/:
     get:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.oam.OamJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.oam.OamJob"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.OamJobWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.oam.OamJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.oam.OamJob.body-param"
+        description: "tapi.oam.OamJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.oam.OamJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -13210,19 +12357,12 @@ paths:
     delete:
       tags:
       - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.oam.OamJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -13230,66 +12370,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/oam-profile/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name/:
+    post:
       tags:
       - "tapi-oam"
-      summary: "returns tapi.oam.OamProfileRef"
-      description: "none"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.oam.OamProfileRef"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name={value-name}/:
+    get:
       tags:
       - "tapi-oam"
-      summary: "creates tapi.oam.OamProfileRef"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
+          description: "Internal error"
     put:
       tags:
       - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamProfileRef"
-      description: "none"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -13300,12 +12457,19 @@ paths:
     delete:
       tags:
       - "tapi-oam"
-      summary: "removes tapi.oam.OamProfileRef"
-      description: "none"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -13313,85 +12477,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-profile/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamProfileRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathComputationContext"
+          description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
-      responses:
-        201:
-          description: "Object created"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationService"
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamProfileRef"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added to\
-          \ list"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -13399,43 +12520,23 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationService"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathComputationService"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationService"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added or\
-          \ updated"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -13445,13 +12546,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationService"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -13459,24 +12560,24 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathServiceEndPoint"
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
+        name: "tapi.oam.OamServiceEndPointRef.body-param"
+        description: "tapi.oam.OamServiceEndPointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -13484,52 +12585,62 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathServiceEndPoint"
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "oam-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      - name: "oam-service-end-point-local-id"
+        in: "path"
+        description: "Id of oam-service-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathServiceEndPoint"
+          description: "tapi.oam.OamServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "oam-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      - name: "oam-service-end-point-local-id"
+        in: "path"
+        description: "Id of oam-service-end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
+        name: "tapi.oam.OamServiceEndPointRef.body-param"
+        description: "tapi.oam.OamServiceEndPointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -13539,18 +12650,23 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathServiceEndPoint"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "oam-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service-end-point"
+        required: true
+        type: "string"
+      - name: "oam-service-end-point-local-id"
+        in: "path"
+        description: "Id of oam-service-end-point"
         required: true
         type: "string"
       responses:
@@ -13558,258 +12674,275 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.Capacity"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.PmCurrentData"
+      description: "Granularity period of the CurrentData identifies the specific\
+        \ CurrentData instance in the scope of this OamJob.\r\n                For\
+        \ example, typically at least\r\n                one 15min and\r\n       \
+        \         one 24hr;\r\n                optionally one additional configurable\
+        \ (< 15min)"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
-          schema:
-            $ref: "#/definitions/tapi.common.Capacity"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.Capacity"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.Capacity"
-      responses:
-        201:
-          description: "Object created"
+          description: "tapi.oam.PmCurrentData"
+          schema:
+            $ref: "#/definitions/tapi.oam.PmCurrentDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.Capacity"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimeInterval"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.Capacity"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.TimeInterval"
+          schema:
+            $ref: "#/definitions/tapi.common.TimeIntervalWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.Capacity"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "unit"
+        in: "path"
+        description: "Id of period"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.PmHistoryData"
+      description: "in case of 24hr Current Data, at least 1 History Data.\r\n   \
+        \             In case of 15min Current Data, at least 16 History Data.\r\n\
+        \                In case of <15min, the number of History Data shall be able\
+        \ to cover a span of 4 hours."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.PmHistoryData"
+          schema:
+            $ref: "#/definitions/tapi.oam.PmHistoryDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.BandwidthProfile"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
   : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/schedule/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.common.TimeRange"
+          schema:
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.common.TimeRange"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -13819,26 +12952,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -13848,71 +12976,33 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "removes tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         400:
           description: "Internal error"
         204:
-          description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
-  : get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamProfile"
+      description: "none"
+      parameters:
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.oam.OamProfile.body-param"
+        description: "tapi.oam.OamProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -13920,28 +13010,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.oam.OamProfile"
+          schema:
+            $ref: "#/definitions/tapi.oam.OamProfileWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.oam.OamProfile.body-param"
+        description: "tapi.oam.OamProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.oam.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -13951,18 +13055,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       responses:
@@ -13970,81 +13069,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
-  : get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name/:
+    post:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-profile"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14054,18 +13155,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -14073,81 +13176,77 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
-  : get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data/:
+    post:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "creates tapi.oam.PmBinData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-profile"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.oam.PmBinData.body-param"
+        description: "tapi.oam.PmBinData to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "returns tapi.oam.PmBinData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.PmBinData"
+          schema:
+            $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.PmBinData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.oam.PmBinData.body-param"
+        description: "tapi.oam.PmBinData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -14157,18 +13256,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-oam"
+      summary: "removes tapi.oam.PmBinData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       responses:
@@ -14176,54 +13275,52 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "creates tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -14233,27 +13330,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -14263,19 +13359,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "removes tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       responses:
@@ -14283,10 +13378,10 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
     post:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14294,12 +13389,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
@@ -14307,7 +13402,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14315,10 +13410,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14326,12 +13421,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - name: "value-name"
@@ -14343,12 +13438,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14356,12 +13451,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - name: "value-name"
@@ -14374,7 +13469,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14384,7 +13479,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14392,12 +13487,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - name: "value-name"
@@ -14410,52 +13505,151 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.oam.PmThresholdData"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.oam.PmThresholdData.body-param"
+        description: "tapi.oam.PmThresholdData to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "returns tapi.oam.PmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.oam.PmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.PmThresholdData"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.oam.PmThresholdData.body-param"
+        description: "tapi.oam.PmThresholdData to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.PmThresholdDataWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-oam"
+      summary: "removes tapi.oam.PmThresholdData"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "creates tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -14465,26 +13659,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -14494,18 +13688,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "removes tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -14513,10 +13707,10 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
     post:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14524,7 +13718,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
@@ -14532,7 +13731,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14540,10 +13739,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14551,7 +13750,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - name: "value-name"
@@ -14563,12 +13767,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14576,7 +13780,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - name: "value-name"
@@ -14589,7 +13798,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14599,7 +13808,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14607,7 +13816,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - name: "value-name"
@@ -14620,66 +13834,62 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service/:
+    post:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.oam.OamService.body-param"
+        description: "tapi.oam.OamService to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.PathObjectiveFunction"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.OamService"
+          schema:
+            $ref: "#/definitions/tapi.oam.OamServiceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.oam.OamService.body-param"
+        description: "tapi.oam.OamService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -14689,13 +13899,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       responses:
@@ -14703,26 +13913,24 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.oam.OamServiceEndPoint.body-param"
+        description: "tapi.oam.OamServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -14730,56 +13938,52 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.oam.OamServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.oam.OamServiceEndPoint.body-param"
+        description: "tapi.oam.OamServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -14789,20 +13993,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -14810,43 +14012,53 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -14856,22 +14068,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -14881,13 +14098,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -14895,10 +14117,58 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.MepRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.MipRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14906,7 +14176,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
@@ -14914,7 +14189,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14922,10 +14197,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14933,7 +14208,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -14945,12 +14225,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14958,7 +14238,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -14971,7 +14256,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -14981,7 +14266,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -14989,7 +14274,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -15002,66 +14292,52 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
+      - "tapi-oam"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.RoutingConstraint"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
+      - "tapi-oam"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -15071,21 +14347,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -15095,13 +14376,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
+      - "tapi-oam"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -15109,25 +14395,45 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/meg/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.MegRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.MegRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.MegRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -15135,54 +14441,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.CostCharacteristic"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -15192,19 +14500,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "value-name"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -15212,80 +14521,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/oam-profile/:
+    get:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamProfileRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.OamProfileRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
-  : get:
+    post:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamProfileRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of oam-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamProfileRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -15295,19 +14590,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamProfileRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of oam-service"
         required: true
         type: "string"
       responses:
@@ -15315,42 +14604,33 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
+      summary: "returns tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.path.computation.PathComputationContext"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -15361,20 +14641,16 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -15385,67 +14661,59 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
+      summary: "removes tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
+    get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.PathComputationService"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates or updates tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -15453,11 +14721,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15468,8 +14737,8 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "removes tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -15481,11 +14750,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15493,17 +14762,24 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
+    get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      summary: "returns tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15511,23 +14787,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.PathServiceEndPoint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15535,12 +14810,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -15551,7 +14831,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15559,16 +14839,21 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15576,24 +14861,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
-  : get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15601,22 +14884,28 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15624,17 +14913,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -15645,7 +14934,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15653,9 +14942,9 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -15663,11 +14952,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15675,17 +14964,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.TopologyConstraint"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15693,12 +14987,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -15709,7 +15008,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15717,12 +15016,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -15733,7 +15037,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -15741,248 +15045,268 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.Path"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "link-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of link"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LinkRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
         400:
           description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.RiskCharacteristic"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point/:
     post:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.context.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.context.ServiceInterfacePoint.body-param"
-        description: "tapi.common.context.ServiceInterfacePoint to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -15990,42 +15314,28 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.context.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.context.ServiceInterfacePoint"
-          schema:
-            $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.context.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.context.ServiceInterfacePoint.body-param"
-        description: "tapi.common.context.ServiceInterfacePoint to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16035,13 +15345,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.context.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -16049,177 +15364,241 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      - "tapi-path-computation"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
         \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
-          \ be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16227,24 +15606,66 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
-          \ be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16254,13 +15675,25 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -16268,248 +15701,252 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelPoolCapabilityPac"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePointRef"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of available-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of available-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of available-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of available-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
-  : get:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of occupied-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
-        in: "path"
-        description: "Id of occupied-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
-  : get:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of occupied-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "value-name"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of name"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of supportable-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "value-name"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of name"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of supportable-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "value-name"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of name"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
     get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementCapabilityPac"
+          description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ to list"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -16519,22 +15956,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -16544,60 +15980,40 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
-  : get:
-      tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerProperties"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16605,25 +16021,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16633,15 +16080,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -16649,46 +16101,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -16698,23 +16147,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -16724,15 +16172,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -16740,69 +16186,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerProperties"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16812,14 +16272,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -16827,44 +16293,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -16874,22 +16362,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -16899,14 +16386,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -16914,26 +16400,25 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -16941,56 +16426,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -17000,20 +16483,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "cost-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
@@ -17021,43 +16503,25 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/:
-    get:
-      tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiServiceInterfacePointSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.photonic.media.OtsiServiceInterfacePointSpec"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
-        400:
-          description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiServiceInterfacePointSpec"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
-          \ to list"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -17065,246 +16529,202 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
-      tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiServiceInterfacePointSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiServiceInterfacePointSpec"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/:
-    get:
-      tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiCapabilityPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiCapabilityPac"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiCapabilityPac"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-application-identifier={application-code}/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.ApplicationIdentifier"
-      description: "The list of supportable ApplicationIdentifiers."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "application-code"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of supportable-application-identifier"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.ApplicationIdentifier"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-lower-central-frequency={central-frequency}/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The lower frequency of the channel spectrum"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of supportable-lower-central-frequency"
+        description: "Id of latency-characteristic"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.CentralFrequency"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-lower-central-frequency={central-frequency}/frequency-constraint/
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      - name: "central-frequency"
-        in: "path"
-        description: "Id of supportable-lower-central-frequency"
-        required: true
-        type: "integer"
-        format: "int32"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-upper-central-frequency={central-frequency}/
-  : get:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The Upper frequency of the channel spectrum"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
-        in: "path"
-        description: "Id of supportable-upper-central-frequency"
-        required: true
-        type: "integer"
-        format: "int32"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.CentralFrequency"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-upper-central-frequency={central-frequency}/frequency-constraint/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
-        in: "path"
-        description: "Id of supportable-upper-central-frequency"
-        required: true
-        type: "integer"
-        format: "int32"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/total-power-warn-threshold/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.TotalPowerThresholdPac"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.TotalPowerThresholdPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPac"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementCapabilityPac"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -17314,22 +16734,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -17339,13 +16758,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -17353,46 +16772,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -17402,23 +16817,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -17428,15 +16841,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -17444,72 +16855,77 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
-  : get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerProperties"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.RiskCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -17519,15 +16935,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
@@ -17535,44 +16954,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -17582,22 +16999,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -17607,14 +17023,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -17622,229 +17037,231 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
-      parameters:
-      - name: "uuid"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of link"
+        required: true
+        type: "string"
+      - name: "link-uuid"
+        in: "path"
+        description: "Id of link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -17855,7 +17272,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -17869,7 +17286,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -17888,7 +17305,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -17907,7 +17324,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -17918,10 +17335,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -17939,10 +17356,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -17958,10 +17375,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -17977,10 +17394,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -18001,10 +17418,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -18025,10 +17442,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -18049,11 +17466,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18073,10 +17490,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18097,11 +17514,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18121,11 +17538,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18145,10 +17562,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -18170,10 +17587,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -18200,11 +17617,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -18230,10 +17647,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -18261,10 +17678,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -18300,10 +17717,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -18324,11 +17741,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -18354,10 +17771,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -18379,11 +17796,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -18403,10 +17820,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -18427,10 +17844,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18451,11 +17868,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18475,10 +17892,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18499,10 +17916,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -18524,11 +17941,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -18554,10 +17971,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -18580,10 +17997,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -18604,10 +18021,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -18643,10 +18060,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -18667,10 +18084,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -18691,11 +18108,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18715,10 +18132,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -18739,11 +18156,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18763,11 +18180,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -18787,10 +18204,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -18812,10 +18229,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -18842,10 +18259,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -18866,11 +18283,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -18896,10 +18313,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -18927,11 +18344,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -18956,11 +18373,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -18985,10 +18402,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -19014,10 +18431,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19043,10 +18460,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19072,10 +18489,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19101,10 +18518,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19130,10 +18547,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19160,10 +18577,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -19195,10 +18612,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -19231,10 +18648,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -19283,10 +18700,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -19317,10 +18734,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -19351,10 +18768,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19385,10 +18802,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19419,10 +18836,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19453,10 +18870,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -19487,10 +18904,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -19522,10 +18939,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -19562,10 +18979,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -19602,10 +19019,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -19643,10 +19060,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -19683,10 +19100,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -19722,10 +19139,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -19773,10 +19190,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -19814,10 +19231,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -19860,10 +19277,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -19901,10 +19318,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -19936,10 +19353,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -19970,10 +19387,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20004,10 +19421,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -20038,10 +19455,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20072,10 +19489,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -20106,10 +19523,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20141,10 +19558,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -20176,11 +19593,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -20212,10 +19629,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -20256,10 +19673,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -20302,10 +19719,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -20337,11 +19754,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -20371,10 +19788,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -20417,10 +19834,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -20453,10 +19870,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -20494,10 +19911,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -20530,10 +19947,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -20560,10 +19977,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -20589,10 +20006,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20618,10 +20035,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -20647,10 +20064,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20676,10 +20093,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -20705,10 +20122,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20735,11 +20152,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -20764,10 +20181,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -20808,10 +20225,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -20837,10 +20254,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -20866,10 +20283,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20895,10 +20312,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -20924,10 +20341,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -20953,10 +20370,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -20982,10 +20399,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -21012,11 +20429,83 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePointRef"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
+  : get:
       tags:
       - "tapi-connectivity"
       summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
@@ -21041,10 +20530,10 @@ paths:
         200:
           description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -21075,10 +20564,10 @@ paths:
         200:
           description: "tapi.connectivity.ceplist.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -21129,10 +20618,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
@@ -21166,10 +20655,10 @@ paths:
         200:
           description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
       - "tapi-connectivity"
@@ -21200,10 +20689,10 @@ paths:
         200:
           description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
@@ -21249,15 +20738,17 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-assembly-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelAssemblySpec"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -21279,18 +20770,23 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelAssemblySpec"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21315,16 +20811,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelPropertiesPac"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepMipList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21349,16 +20845,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelPropertiesPac"
+          description: "tapi.oam.MepMipList"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+            $ref: "#/definitions/tapi.oam.MepMipListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/measured-power-egress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mep={meg-uuid},{mep-local-id}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21381,18 +20877,28 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      - name: "mep-local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
+          description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/measured-power-ingress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mip={meg-uuid},{mip-local-id}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21415,18 +20921,28 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      - name: "mip-local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
+          description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/occupied-spectrum/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21451,16 +20967,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.odu.OduConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/occupied-spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-common/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21485,16 +21001,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.odu.OduCommonPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.odu.OduCommonPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-ctp/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepMipList"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21519,16 +21035,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepMipList"
+          description: "tapi.odu.OduCtpPac"
           schema:
-            $ref: "#/definitions/tapi.oam.MepMipList"
+            $ref: "#/definitions/tapi.odu.OduCtpPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mep={meg-uuid},{mep-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-protection/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduProtectionPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21551,28 +21067,18 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
-      - name: "mep-local-id"
-        in: "path"
-        description: "Id of mep"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.odu.OduProtectionPac"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.odu.OduProtectionPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mip={meg-uuid},{mip-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21595,31 +21101,58 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
+      responses:
+        200:
+          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPayloadType"
+      description: "This attribute is applicable when the ODU CTP object instance\
+        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
+        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
+        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
+        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
+        \ G.709 with one additional value UN_INTERPRETABLE."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of topology"
         required: true
         type: "string"
-      - name: "mip-local-id"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MipRef"
+          description: "tapi.odu.OduPayloadType"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.odu.OduPayloadTypeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.FecProperties"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -21641,23 +21174,18 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.odu.FecProperties"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.odu.FecPropertiesWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-assembly-spec/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectionEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelAssemblySpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21682,16 +21210,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectionEndPointSpec"
+          description: "tapi.photonic.media.MediaChannelAssemblySpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-common/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/
   : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCommonPac"
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21716,16 +21244,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCommonPac"
+          description: "tapi.photonic.media.MediaChannelConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCommonPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-ctp/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCtpPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelPropertiesPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21750,16 +21278,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCtpPac"
+          description: "tapi.photonic.media.MediaChannelPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCtpPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-protection/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/measured-power-egress/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduProtectionPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21784,16 +21312,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduProtectionPac"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduProtectionPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/measured-power-ingress/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21818,22 +21346,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/occupied-spectrum/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPayloadType"
-      description: "This attribute is applicable when the ODU CTP object instance\
-        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
-        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
-        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
-        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
-        \ G.709 with one additional value UN_INTERPRETABLE."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -21857,16 +21380,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduPayloadType"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPayloadType"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/occupied-spectrum/frequency-constraint/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.FecProperties"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -21891,12 +21414,12 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.FecProperties"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.odu.FecProperties"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -21927,10 +21450,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -21961,10 +21484,10 @@ paths:
         200:
           description: "tapi.photonic.media.MediaChannelPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/measured-power-egress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/measured-power-egress/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -21995,10 +21518,10 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/measured-power-ingress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/measured-power-ingress/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22029,10 +21552,10 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22063,10 +21586,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22097,10 +21620,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-assembly-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-assembly-connection-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22131,10 +21654,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-assembly-connection-end-point-spec/fec-parameters/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-assembly-connection-end-point-spec/fec-parameters/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22165,10 +21688,10 @@ paths:
         200:
           description: "tapi.photonic.media.FecPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FecPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.FecPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-assembly-connection-end-point-spec/otsi-adapter/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-assembly-connection-end-point-spec/otsi-adapter/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22199,10 +21722,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiGserverAdaptationPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiGserverAdaptationPac"
+            $ref: "#/definitions/tapi.photonic.media.OtsiGserverAdaptationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22234,10 +21757,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22268,10 +21791,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiTerminationPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPac"
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/laser-properties/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/laser-properties/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22302,10 +21825,10 @@ paths:
         200:
           description: "tapi.photonic.media.LaserPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.LaserPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.LaserPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/received-power/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/received-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22336,10 +21859,10 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-application-identifier/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-application-identifier/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22386,10 +21909,10 @@ paths:
         200:
           description: "tapi.photonic.media.ApplicationIdentifier"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22420,10 +21943,10 @@ paths:
         200:
           description: "tapi.photonic.media.CentralFrequency"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22454,10 +21977,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-spectrum/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-spectrum/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22488,10 +22011,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-spectrum/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22522,10 +22045,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/transmited-power/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/transmited-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22556,15 +22079,16 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-odu:odu-node-edge-point-spec/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
-      description: "none"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduNodeEdgePointSpec"
+      description: "Augments the base LayerProtocol information in NodeEdgePoint with\
+        \ ODU-specific information"
       parameters:
       - name: "uuid"
         in: "path"
@@ -22581,26 +22105,19 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.odu.OduNodeEdgePointSpec"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-odu:odu-node-edge-point-spec/odu-pool/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPoolPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -22617,19 +22134,14 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "service-interface-point-uuid"
-        in: "path"
-        description: "Id of mapped-service-interface-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.odu.OduPoolPac"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.odu.OduPoolPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22656,10 +22168,10 @@ paths:
         200:
           description: "tapi.photonic.media.MediaChannelNodeEdgePointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22685,10 +22197,10 @@ paths:
         200:
           description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22726,10 +22238,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22767,10 +22279,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22808,10 +22320,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22849,10 +22361,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22890,10 +22402,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -22931,105 +22443,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/odu-node-edge-point-spec/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduNodeEdgePointSpec"
-      description: "Augments the base LayerProtocol information in NodeEdgePoint with\
-        \ ODU-specific information"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduNodeEdgePointSpec"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/odu-node-edge-point-spec/odu-pool/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPoolPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduPoolPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduPoolPac"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -23056,10 +22473,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -23085,10 +22502,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -23114,10 +22531,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -23143,10 +22560,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -23172,10 +22589,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -23201,10 +22618,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -23231,10 +22648,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -23256,11 +22673,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -23280,10 +22697,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -23304,10 +22721,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -23328,11 +22745,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -23352,10 +22769,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -23376,10 +22793,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -23401,505 +22818,506 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-job/:
+  /operations/tapi-connectivity:create-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamJob"
-      description: "operates on tapi.oam.CreateOamJob"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamjob.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamjob.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamJob"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service-end-point/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
-      description: "operates on tapi.oam.CreateOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamService"
-      description: "operates on tapi.oam.CreateOamService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectionDetails"
+      description: "operates on tapi.connectivity.GetConnectionDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamservice.Input.body-param"
+        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
+      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
+        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-job/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamJob"
-      description: "operates on tapi.oam.DeleteOamJob"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.deleteoamjob.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
+      - "tapi-connectivity"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service-end-point/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
-      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamService"
-      description: "operates on tapi.oam.DeleteOamService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamservice.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionDetails"
-      description: "operates on tapi.connectivity.GetConnectionDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
-      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
+      - "tapi-notification"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-connectivity"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-meg/:
+  /operations/tapi-oam:create-oam-job/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetMeg"
-      description: "operates on tapi.oam.GetMeg"
+      summary: "operates on tapi.oam.CreateOamJob"
+      description: "operates on tapi.oam.CreateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.oam.getmeg.Input.body-param"
+        name: "tapi.oam.createoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getmeg.Input"
+              $ref: "#/definitions/tapi.oam.createoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetMeg"
+            $ref: "#/definitions/tapi.oam.CreateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-oam:create-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
+      description: "operates on tapi.oam.CreateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-oam:create-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamService"
+      description: "operates on tapi.oam.CreateOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.oam.createoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-oam:delete-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamJob"
+      description: "operates on tapi.oam.DeleteOamJob"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
+        name: "tapi.oam.deleteoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-oam:delete-oam-service-end-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-oam:delete-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamService"
+      description: "operates on tapi.oam.DeleteOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.deleteoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-oam:get-meg/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetMeg"
+      description: "operates on tapi.oam.GetMeg"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.getmeg.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.getmeg.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.oam.GetMeg"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-job/:
+  /operations/tapi-oam:get-oam-job/:
     post:
       tags:
       - "tapi-oam"
@@ -23922,7 +23340,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-end-point/:
+  /operations/tapi-oam:get-oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -23945,7 +23363,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-list/:
+  /operations/tapi-oam:get-oam-service-list/:
     post:
       tags:
       - "tapi-oam"
@@ -23959,7 +23377,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service/:
+  /operations/tapi-oam:get-oam-service/:
     post:
       tags:
       - "tapi-oam"
@@ -23977,252 +23395,251 @@ paths:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetOamService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/get-service-interface-point-details/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/get-service-interface-point-list/:
-    post:
-      tags:
-      - "tapi-common"
-      parameters: []
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.oam.GetOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-oam:update-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamJob"
+      description: "operates on tapi.oam.UpdateOamJob"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamjob.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.oam.UpdateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-oam:update-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-oam:update-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamService"
+      description: "operates on tapi.oam.UpdateOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.oam.UpdateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/optimize-p-2-ppath/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-connectivity-service/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-job/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamJob"
-      description: "operates on tapi.oam.UpdateOamJob"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamjob.Input.body-param"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamJob"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service-end-point/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
-      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamService"
-      description: "operates on tapi.oam.UpdateOamService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamservice.Input.body-param"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamService"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-topology:get-topology-list/:
+    post:
+      tags:
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -24278,6 +23695,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -24321,13 +23742,21 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
-    - $ref: "#/definitions/tapi.connectivity.ContextAugmentation3"
-    - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
-    - $ref: "#/definitions/tapi.oam.ContextAugmentation2"
-    - $ref: "#/definitions/tapi.path.computation.ContextAugmentation4"
+    - $ref: "#/definitions/tapi.connectivity.ContextAugmentation4"
+    - $ref: "#/definitions/tapi.notification.ContextAugmentation2"
+    - $ref: "#/definitions/tapi.oam.ContextAugmentation1"
+    - $ref: "#/definitions/tapi.path.computation.ContextAugmentation3"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation5"
     - type: "object"
       properties:
@@ -24337,6 +23766,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
       description: "none"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -24418,6 +23851,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -24478,6 +23915,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
   tapi.common.TerminationDirection:
     type: "string"
     enum:
@@ -24516,6 +23957,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.common.TimePeriod"
+  tapi.common.TimeIntervalWrapper:
+    properties:
+      elapsed-time:
+        $ref: "#/definitions/tapi.common.TimeInterval"
   tapi.common.TimePeriod:
     type: "object"
     properties:
@@ -24526,6 +23971,10 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.TimeUnit"
+  tapi.common.TimePeriodWrapper:
+    properties:
+      period:
+        $ref: "#/definitions/tapi.common.TimePeriod"
   tapi.common.TimeRange:
     type: "object"
     properties:
@@ -24535,6 +23984,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.TimeUnit:
     type: "string"
     enum:
@@ -24553,6 +24006,10 @@ definitions:
     - $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
     - $ref: "#/definitions/tapi.photonic.media.ServiceInterfacePointAugmentation1"
     - $ref: "#/definitions/tapi.photonic.media.ServiceInterfacePointAugmentation2"
+  tapi.common.context.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
   tapi.common.getserviceinterfacepointdetails.Input:
     type: "object"
     properties:
@@ -24596,6 +24053,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -24704,6 +24165,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -24711,6 +24176,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -24723,6 +24192,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -24788,6 +24265,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -24853,6 +24334,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -24860,7 +24345,11 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
-  tapi.connectivity.ContextAugmentation3:
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+  tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
       connectivity-context:
@@ -24900,7 +24389,7 @@ definitions:
     properties:
       output:
         $ref: "#/definitions/tapi.connectivity.getconnectivityservicelist.Output"
-  tapi.connectivity.OwnedNodeEdgePointAugmentation1:
+  tapi.connectivity.OwnedNodeEdgePointAugmentation2:
     type: "object"
     properties:
       cep-list:
@@ -24998,6 +24487,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -25030,6 +24523,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -25135,6 +24636,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -25143,13 +24656,17 @@ definitions:
   tapi.connectivity.ceplist.ConnectionEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
-    - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation7"
-    - $ref: "#/definitions/tapi.odu.ConnectionEndPointAugmentation6"
+    - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation6"
+    - $ref: "#/definitions/tapi.odu.ConnectionEndPointAugmentation7"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation1"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation2"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation3"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation4"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation5"
+  tapi.connectivity.ceplist.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
   tapi.connectivity.connectivitycontext.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -25171,6 +24688,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ConnectionRef"
       description: "none"
+  tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
   tapi.connectivity.connectivityservice.EndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
@@ -25179,6 +24700,10 @@ definitions:
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation2"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation3"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation4"
+  tapi.connectivity.connectivityservice.EndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -25189,6 +24714,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
       description: "none"
+  tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
   tapi.connectivity.createconnectivityservice.Input:
     type: "object"
     properties:
@@ -25420,7 +24949,11 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
-  tapi.notification.ContextAugmentation1:
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
+  tapi.notification.ContextAugmentation2:
     type: "object"
     properties:
       notification-context:
@@ -25471,6 +25004,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -25543,6 +25080,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -25556,6 +25097,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -25586,6 +25131,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -25594,6 +25143,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -25682,6 +25235,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -25714,6 +25271,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -25820,7 +25381,7 @@ definitions:
       subscription-service:
         description: "none"
         $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
-  tapi.oam.ConnectionEndPointAugmentation7:
+  tapi.oam.ConnectionEndPointAugmentation6:
     type: "object"
     properties:
       mep-mip-list:
@@ -25829,7 +25390,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-oam"
       namespace: "urn:onf:otcc:yang:tapi-oam"
-  tapi.oam.ContextAugmentation2:
+  tapi.oam.ContextAugmentation1:
     type: "object"
     properties:
       oam-context:
@@ -25918,6 +25479,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid"
+  tapi.oam.MegRefWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.MegRef"
   tapi.oam.Mep:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -25952,6 +25517,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepMipListWrapper:
+    properties:
+      tapi-oam:mep-mip-list:
+        $ref: "#/definitions/tapi.oam.MepMipList"
   tapi.oam.MepRef:
     allOf:
     - $ref: "#/definitions/tapi.oam.MegRef"
@@ -25962,6 +25531,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MepRefWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.MepRef"
   tapi.oam.Mip:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -25981,6 +25554,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MipRefWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.MipRef"
   tapi.oam.OamConstraint:
     type: "object"
     properties:
@@ -26017,6 +25594,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.Meg"
+  tapi.oam.OamContextWrapper:
+    properties:
+      tapi-oam:oam-context:
+        $ref: "#/definitions/tapi.oam.OamContext"
   tapi.oam.OamJob:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -26050,6 +25631,10 @@ definitions:
           type: "string"
           description: "none"
       description: "none"
+  tapi.oam.OamJobWrapper:
+    properties:
+      oam-job:
+        $ref: "#/definitions/tapi.oam.OamJob"
   tapi.oam.OamProfile:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -26073,6 +25658,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid"
+  tapi.oam.OamProfileRefWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfileRef"
+  tapi.oam.OamProfileWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfile"
   tapi.oam.OamService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -26141,6 +25734,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id"
       description: "none"
+  tapi.oam.OamServiceEndPointRefWrapper:
+    properties:
+      oam-service-end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+  tapi.oam.OamServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
   tapi.oam.OamServiceRef:
     type: "object"
     properties:
@@ -26148,6 +25749,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid"
+  tapi.oam.OamServiceWrapper:
+    properties:
+      oam-service:
+        $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.PmBinData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -26157,6 +25762,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmBinDataWrapper:
+    properties:
+      pm-bin-data:
+        $ref: "#/definitions/tapi.oam.PmBinData"
   tapi.oam.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -26196,6 +25805,10 @@ definitions:
             \ hour in case of a 15 minute interval and bound to the hour in case of\
             \ a 24 hour interval."
       description: "none"
+  tapi.oam.PmCurrentDataWrapper:
+    properties:
+      pm-current-data:
+        $ref: "#/definitions/tapi.oam.PmCurrentData"
   tapi.oam.PmHistoryData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -26213,6 +25826,10 @@ definitions:
             \ be reliable."
           default: false
       description: "none"
+  tapi.oam.PmHistoryDataWrapper:
+    properties:
+      pm-history-data:
+        $ref: "#/definitions/tapi.oam.PmHistoryData"
   tapi.oam.PmThresholdData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -26226,6 +25843,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmThresholdDataWrapper:
+    properties:
+      pm-threshold-data:
+        $ref: "#/definitions/tapi.oam.PmThresholdData"
   tapi.oam.UpdateOamJob:
     type: "object"
     properties:
@@ -26406,10 +26027,18 @@ definitions:
     allOf:
     - $ref: "#/definitions/tapi.oam.Mep"
     - $ref: "#/definitions/tapi.odu.MepAugmentation1"
+  tapi.oam.meg.MepWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.meg.Mep"
   tapi.oam.meg.Mip:
     allOf:
     - $ref: "#/definitions/tapi.oam.Mip"
     - $ref: "#/definitions/tapi.odu.MipAugmentation1"
+  tapi.oam.meg.MipWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.meg.Mip"
   tapi.oam.oamcontext.Meg:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -26443,6 +26072,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "none"
+  tapi.oam.oamcontext.MegWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.oamcontext.Meg"
   tapi.oam.updateoamjob.Input:
     type: "object"
     properties:
@@ -26505,7 +26138,7 @@ definitions:
       end-point:
         description: "none"
         $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
-  tapi.odu.ConnectionEndPointAugmentation6:
+  tapi.odu.ConnectionEndPointAugmentation7:
     type: "object"
     properties:
       odu-connection-end-point-spec:
@@ -26532,6 +26165,10 @@ definitions:
     enum:
     - "PERCENTAGE"
     - "NUMBER_ERRORED_BLOCKS"
+  tapi.odu.DegThrWrapper:
+    properties:
+      deg-thr:
+        $ref: "#/definitions/tapi.odu.DegThr"
   tapi.odu.EndPointAugmentation5:
     type: "object"
     properties:
@@ -26568,6 +26205,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "counter: bit error rate after correction by FEC"
+  tapi.odu.FecPropertiesWrapper:
+    properties:
+      fec-parameters:
+        $ref: "#/definitions/tapi.odu.FecProperties"
   tapi.odu.MappingType:
     type: "string"
     enum:
@@ -26629,6 +26270,10 @@ definitions:
       odu-type:
         type: "string"
         description: "This attribute specifies the type of the ODU termination point."
+  tapi.odu.OduCommonPacWrapper:
+    properties:
+      odu-common:
+        $ref: "#/definitions/tapi.odu.OduCommonPac"
   tapi.odu.OduConnectionEndPointSpec:
     type: "object"
     properties:
@@ -26644,6 +26289,10 @@ definitions:
       odu-protection:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduProtectionPac"
+  tapi.odu.OduConnectionEndPointSpecWrapper:
+    properties:
+      tapi-odu:odu-connection-end-point-spec:
+        $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
   tapi.odu.OduConnectivityServiceEndPointSpec:
     type: "object"
     properties:
@@ -26656,6 +26305,10 @@ definitions:
       odu-csep-ttp-pac:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+  tapi.odu.OduConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-odu:odu-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
   tapi.odu.OduCsepCommonPac:
     type: "object"
     properties:
@@ -26688,6 +26341,10 @@ definitions:
       odu-type:
         type: "string"
         description: "This attribute specifies the type of the ODU termination point."
+  tapi.odu.OduCsepCommonPacWrapper:
+    properties:
+      odu-csep-common-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
   tapi.odu.OduCsepCtpPac:
     type: "object"
     properties:
@@ -26748,6 +26405,10 @@ definitions:
           \n                In case of ODUk mapping over ODUCn, the TPN is encoded\
           \ in a 14-bit field so the value range is 0-16383. See clause 20.4.1.1/G.709-2016.\r\
           \n                "
+  tapi.odu.OduCsepCtpPacWrapper:
+    properties:
+      odu-csep-ctp-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
   tapi.odu.OduCsepTtpPac:
     type: "object"
     properties:
@@ -26758,6 +26419,10 @@ definitions:
         type: "string"
         description: "This attribute configures the type of the client CTP of the\
           \ server ODU TTP."
+  tapi.odu.OduCsepTtpPacWrapper:
+    properties:
+      odu-csep-ttp-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
   tapi.odu.OduCtpPac:
     type: "object"
     properties:
@@ -26826,6 +26491,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.odu.OduCtpPacWrapper:
+    properties:
+      odu-ctp:
+        $ref: "#/definitions/tapi.odu.OduCtpPac"
   tapi.odu.OduDefectPac:
     type: "object"
     properties:
@@ -26853,6 +26522,10 @@ definitions:
         type: "boolean"
         description: "Trail Trace Identifier Mismatch"
         default: false
+  tapi.odu.OduDefectPacWrapper:
+    properties:
+      odu-defect:
+        $ref: "#/definitions/tapi.odu.OduDefectPac"
   tapi.odu.OduMipPac:
     type: "object"
     properties:
@@ -26898,6 +26571,10 @@ definitions:
           \ system to enable or disable the Consequent Action function when detecting\
           \ Trace Identifier Mismatch (TIM) at the trail termination sink."
         default: true
+  tapi.odu.OduMipPacWrapper:
+    properties:
+      odu-mip:
+        $ref: "#/definitions/tapi.odu.OduMipPac"
   tapi.odu.OduMipSpec:
     type: "object"
     properties:
@@ -26916,6 +26593,10 @@ definitions:
       odu-defect:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduDefectPac"
+  tapi.odu.OduMipSpecWrapper:
+    properties:
+      tapi-odu:odu-mip-spec:
+        $ref: "#/definitions/tapi.odu.OduMipSpec"
   tapi.odu.OduNamedPayloadType:
     type: "string"
     enum:
@@ -26930,12 +26611,20 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.odu.OduNcmPacWrapper:
+    properties:
+      odu-ncm:
+        $ref: "#/definitions/tapi.odu.OduNcmPac"
   tapi.odu.OduNodeEdgePointSpec:
     type: "object"
     properties:
       odu-pool:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduPoolPac"
+  tapi.odu.OduNodeEdgePointSpecWrapper:
+    properties:
+      tapi-odu:odu-node-edge-point-spec:
+        $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
   tapi.odu.OduPayloadType:
     type: "object"
     properties:
@@ -26946,6 +26635,10 @@ definitions:
       named-payload-type:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduNamedPayloadType"
+  tapi.odu.OduPayloadTypeWrapper:
+    properties:
+      accepted-payload-type:
+        $ref: "#/definitions/tapi.odu.OduPayloadType"
   tapi.odu.OduPmPac:
     type: "object"
     properties:
@@ -26968,6 +26661,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "Near-end Severely Errored Second"
+  tapi.odu.OduPmPacWrapper:
+    properties:
+      odu-pm:
+        $ref: "#/definitions/tapi.odu.OduPmPac"
   tapi.odu.OduPoolPac:
     type: "object"
     properties:
@@ -26983,6 +26680,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.odu.OduPoolPacWrapper:
+    properties:
+      odu-pool:
+        $ref: "#/definitions/tapi.odu.OduPoolPac"
   tapi.odu.OduProtectionPac:
     type: "object"
     properties:
@@ -27002,6 +26703,10 @@ definitions:
           \ triggers the MI_APS_LVL signal to the transport adaptation function. The\
           \ value 0 means path and the values 1 through 6 mean TCM level 1 through\
           \ 6 respectively."
+  tapi.odu.OduProtectionPacWrapper:
+    properties:
+      odu-protection:
+        $ref: "#/definitions/tapi.odu.OduProtectionPac"
   tapi.odu.OduSlotSize:
     type: "string"
     enum:
@@ -27015,6 +26720,10 @@ definitions:
         format: "int32"
         description: "This attribute indicates the tandem connection monitoring field\
           \ of the ODU OH."
+  tapi.odu.OduTcmMipPacWrapper:
+    properties:
+      odu-tcm:
+        $ref: "#/definitions/tapi.odu.OduTcmMipPac"
   tapi.odu.OduTerminationAndClientAdaptationPac:
     type: "object"
     properties:
@@ -27062,7 +26771,11 @@ definitions:
         type: "string"
         description: "This attribute configures the type of the client CTP of the\
           \ server ODU TTP."
-  tapi.odu.OwnedNodeEdgePointAugmentation3:
+  tapi.odu.OduTerminationAndClientAdaptationPacWrapper:
+    properties:
+      odu-term-and-adapter:
+        $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+  tapi.odu.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
       odu-node-edge-point-spec:
@@ -27105,12 +26818,16 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.odu.UasChoiceWrapper:
+    properties:
+      uas:
+        $ref: "#/definitions/tapi.odu.UasChoice"
   tapi.path.computation.ComputeP2PPath:
     type: "object"
     properties:
       output:
         $ref: "#/definitions/tapi.path.computation.computep2ppath.Output"
-  tapi.path.computation.ContextAugmentation4:
+  tapi.path.computation.ContextAugmentation3:
     type: "object"
     properties:
       path-computation-context:
@@ -27173,6 +26890,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -27201,6 +26922,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -27222,6 +26947,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -27231,6 +26960,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -27238,6 +26971,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -27274,6 +27011,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -27326,6 +27071,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -27378,6 +27127,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -27389,6 +27142,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -27474,6 +27231,10 @@ definitions:
     - "ITUT_G698_2"
     - "ITUT_G696_1"
     - "ITUT_G695"
+  tapi.photonic.media.ApplicationIdentifierWrapper:
+    properties:
+      supportable-application-identifier:
+        $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
   tapi.photonic.media.CentralFrequency:
     type: "object"
     properties:
@@ -27485,6 +27246,32 @@ definitions:
       frequency-constraint:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+  tapi.photonic.media.CentralFrequencyBand:
+    type: "object"
+    properties:
+      upper-central-frequency:
+        type: "integer"
+        format: "int32"
+        description: "The upper central frequency that can be tuned in the laser specified\
+          \ in MHz.\r\n                It is the oscillation frequency of the corresponding\
+          \ electromagnetic wave. "
+      lower-central-frequency:
+        type: "integer"
+        format: "int32"
+        description: "The lower central frequency that can be tuned in the laser specified\
+          \ in MHz.\r\n                It is the oscillation frequency of the corresponding\
+          \ electromagnetic wave. "
+      frequency-constraint:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+  tapi.photonic.media.CentralFrequencyBandWrapper:
+    properties:
+      supportable-central-frequency-spectrum-band:
+        $ref: "#/definitions/tapi.photonic.media.CentralFrequencyBand"
+  tapi.photonic.media.CentralFrequencyWrapper:
+    properties:
+      central-frequency:
+        $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
   tapi.photonic.media.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
@@ -27498,54 +27285,54 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
-      media-channel-connection-end-point-spec:
+      media-channel-assembly-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.ConnectionEndPointAugmentation3:
     type: "object"
     properties:
-      otsi-assembly-connection-end-point-spec:
+      media-channel-connection-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.ConnectionEndPointAugmentation4:
     type: "object"
     properties:
-      ots-connection-end-point-spec:
+      otsi-assembly-connection-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.ConnectionEndPointAugmentation5:
     type: "object"
     properties:
-      media-channel-assembly-spec:
+      ots-connection-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation1:
     type: "object"
     properties:
-      media-channel-aconnectivity-service-end-point-spec:
+      otsia-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation2:
     type: "object"
     properties:
-      otsi-aconnectivity-service-end-point-spec:
+      otsi-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
@@ -27561,9 +27348,9 @@ definitions:
   tapi.photonic.media.EndPointAugmentation4:
     type: "object"
     properties:
-      otsi-connectivity-service-end-point-spec:
+      mca-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
@@ -27594,6 +27381,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "counter: bit error rate after correction by FEC"
+  tapi.photonic.media.FecPropertiesPacWrapper:
+    properties:
+      fec-parameters:
+        $ref: "#/definitions/tapi.photonic.media.FecPropertiesPac"
   tapi.photonic.media.FrequencyConstraint:
     type: "object"
     properties:
@@ -27605,6 +27396,10 @@ definitions:
         description: "Specifies the frequency grid standard used to determine the\
           \ nominal central frequency and frequency slot width"
         $ref: "#/definitions/tapi.photonic.media.GridType"
+  tapi.photonic.media.FrequencyConstraintWrapper:
+    properties:
+      frequency-constraint:
+        $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
   tapi.photonic.media.GridType:
     type: "string"
     enum:
@@ -27644,13 +27439,17 @@ definitions:
       laser-status:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.LaserControlStatusType"
+  tapi.photonic.media.LaserPropertiesPacWrapper:
+    properties:
+      laser-properties:
+        $ref: "#/definitions/tapi.photonic.media.LaserPropertiesPac"
   tapi.photonic.media.LaserType:
     type: "string"
     enum:
     - "PUMP"
     - "MODULATED"
     - "PULSE"
-  tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec:
+  tapi.photonic.media.McaConnectivityServiceEndPointSpec:
     type: "object"
     properties:
       number-of-mc:
@@ -27668,8 +27467,16 @@ definitions:
           \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
           \ be omitted if spectrum is not specified."
         $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:mca-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpec"
   tapi.photonic.media.MediaChannelAssemblySpec:
     type: "object"
+  tapi.photonic.media.MediaChannelAssemblySpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-assembly-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
   tapi.photonic.media.MediaChannelConfigPac:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -27685,27 +27492,40 @@ definitions:
         \ MC / OTSiMC.\r\n            The [1..*] with MediaChannelAConnectivityServiceEndPointSpec\
         \ allows the configuration of power properties (PowerManagementConfigPac)\
         \ even in case of no spectrum specified, i.e. 'empty' MediaChannelConfigPac."
+  tapi.photonic.media.MediaChannelConfigPacWrapper:
+    properties:
+      mc-config:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
   tapi.photonic.media.MediaChannelConnectionEndPointSpec:
     type: "object"
     properties:
       media-channel:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+  tapi.photonic.media.MediaChannelConnectionEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
   tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec:
     type: "object"
     properties:
-      power-management-config:
-        description: "none"
-        $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
       mc-config:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+  tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
   tapi.photonic.media.MediaChannelNodeEdgePointSpec:
     type: "object"
     properties:
       mc-pool:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
+  tapi.photonic.media.MediaChannelNodeEdgePointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-node-edge-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
   tapi.photonic.media.MediaChannelPoolCapabilityPac:
     type: "object"
     properties:
@@ -27724,6 +27544,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+  tapi.photonic.media.MediaChannelPoolCapabilityPacWrapper:
+    properties:
+      mc-pool:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
   tapi.photonic.media.MediaChannelPropertiesPac:
     type: "object"
     properties:
@@ -27736,6 +27560,10 @@ definitions:
       measured-power-ingress:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+  tapi.photonic.media.MediaChannelPropertiesPacWrapper:
+    properties:
+      media-channel:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
   tapi.photonic.media.MediaChannelServiceInterfacePointSpec:
     type: "object"
     properties:
@@ -27745,6 +27573,10 @@ definitions:
       power-management-capability:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+  tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-service-interface-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
   tapi.photonic.media.ModulationTechnique:
     type: "string"
     enum:
@@ -27773,19 +27605,10 @@ definitions:
       ots-media-channel:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
-  tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec:
-    type: "object"
+  tapi.photonic.media.OtsConnectionEndPointSpecWrapper:
     properties:
-      otsi-config:
-        type: "array"
-        description: "none"
-        items:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
-      number-of-otsi:
-        type: "integer"
-        format: "int32"
-        description: "none"
-        default: 1
+      tapi-photonic-media:ots-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
   tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec:
     type: "object"
     properties:
@@ -27795,14 +27618,23 @@ definitions:
       fec-parameters:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.FecPropertiesPac"
+  tapi.photonic.media.OtsiAssemblyConnectionEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-assembly-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
   tapi.photonic.media.OtsiCapabilityPac:
     type: "object"
     properties:
-      supportable-lower-central-frequency:
+      supportable-central-frequency-spectrum-band:
         type: "array"
-        description: "The lower frequency of the channel spectrum"
+        description: "Each spectrum band supported for otsi trasmitter to be tuned\
+          \ on,\r\n                is specified as per it's lower and upper central\
+          \ frequencies supported and its frequency constraints,\r\n             \
+          \   consisting in the frequency Grid and the AdjustmentGranularity,\r\n\
+          \                used to uniquely identify all central frequencies supported\
+          \ within the band."
         items:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyBand"
       supportable-application-identifier:
         type: "array"
         description: "The list of supportable ApplicationIdentifiers."
@@ -27816,23 +27648,30 @@ definitions:
       total-power-warn-threshold:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPac"
-      supportable-upper-central-frequency:
-        type: "array"
-        description: "The Upper frequency of the channel spectrum"
-        items:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+  tapi.photonic.media.OtsiCapabilityPacWrapper:
+    properties:
+      otsi-capability:
+        $ref: "#/definitions/tapi.photonic.media.OtsiCapabilityPac"
   tapi.photonic.media.OtsiConnectionEndPointSpec:
     type: "object"
     properties:
       otsi-termination:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPac"
+  tapi.photonic.media.OtsiConnectionEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
   tapi.photonic.media.OtsiConnectivityServiceEndPointSpec:
     type: "object"
     properties:
       otsi-config:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+  tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
   tapi.photonic.media.OtsiGserverAdaptationPac:
     type: "object"
     properties:
@@ -27840,6 +27679,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.photonic.media.OtsiGserverAdaptationPacWrapper:
+    properties:
+      otsi-adapter:
+        $ref: "#/definitions/tapi.photonic.media.OtsiGserverAdaptationPac"
   tapi.photonic.media.OtsiServiceInterfacePointSpec:
     type: "object"
     properties:
@@ -27849,6 +27692,10 @@ definitions:
       power-management-capability:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+  tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-service-interface-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
   tapi.photonic.media.OtsiTerminationConfigPac:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -27887,6 +27734,10 @@ definitions:
         \ OTSi.\r\n            In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec),\
         \ it is intended that the choice of the parameter values is fully delegated\
         \ to the server controller."
+  tapi.photonic.media.OtsiTerminationConfigPacWrapper:
+    properties:
+      otsi-config:
+        $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
   tapi.photonic.media.OtsiTerminationPac:
     type: "object"
     properties:
@@ -27927,7 +27778,28 @@ definitions:
       selected-spectrum:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
-  tapi.photonic.media.OwnedNodeEdgePointAugmentation2:
+  tapi.photonic.media.OtsiTerminationPacWrapper:
+    properties:
+      otsi-termination:
+        $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPac"
+  tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec:
+    type: "object"
+    properties:
+      otsi-config:
+        type: "array"
+        description: "none"
+        items:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      number-of-otsi:
+        type: "integer"
+        format: "int32"
+        description: "none"
+        default: 1
+  tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsia-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
+  tapi.photonic.media.OwnedNodeEdgePointAugmentation3:
     type: "object"
     properties:
       media-channel-node-edge-point-spec:
@@ -27960,6 +27832,10 @@ definitions:
           \                at the Logical-Termination-Point (LTP) associated to the\
           \ SIP."
         $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+  tapi.photonic.media.PowerManagementCapabilityPacWrapper:
+    properties:
+      power-management-capability:
+        $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
   tapi.photonic.media.PowerManagementConfigPac:
     type: "object"
     properties:
@@ -27983,6 +27859,10 @@ definitions:
           \n                desired at the Logical-Termination-Point (LTP) associated\
           \ to the CSEP."
         $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+  tapi.photonic.media.PowerManagementConfigPacWrapper:
+    properties:
+      power-management-config-pac:
+        $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
   tapi.photonic.media.PowerProperties:
     type: "object"
     properties:
@@ -28003,6 +27883,14 @@ definitions:
       total-power:
         type: "string"
         description: "The total power at any point in a channel specified in dBm."
+  tapi.photonic.media.PowerPropertiesPacWrapper:
+    properties:
+      transmit-power:
+        $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+  tapi.photonic.media.PowerPropertiesWrapper:
+    properties:
+      supportable-maximum-output-power:
+        $ref: "#/definitions/tapi.photonic.media.PowerProperties"
   tapi.photonic.media.SelectedModulation:
     type: "string"
     enum:
@@ -28019,36 +27907,36 @@ definitions:
   tapi.photonic.media.ServiceInterfacePointAugmentation1:
     type: "object"
     properties:
-      media-channel-service-interface-point-spec:
+      otsi-service-interface-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.ServiceInterfacePointAugmentation2:
     type: "object"
     properties:
-      otsi-service-interface-point-spec:
+      media-channel-service-interface-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.SipAugmentation1:
     type: "object"
     properties:
-      media-channel-service-interface-point-spec:
+      otsi-service-interface-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.SipAugmentation2:
     type: "object"
     properties:
-      otsi-service-interface-point-spec:
+      media-channel-service-interface-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
@@ -28068,6 +27956,10 @@ definitions:
       frequency-constraint:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+  tapi.photonic.media.SpectrumBandWrapper:
+    properties:
+      available-spectrum:
+        $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
   tapi.photonic.media.TotalPowerThresholdPac:
     type: "object"
     properties:
@@ -28089,6 +27981,10 @@ definitions:
       total-power-lower-warn-threshold-default:
         type: "string"
         description: "Can read the value of the default  threshold that was set"
+  tapi.photonic.media.TotalPowerThresholdPacWrapper:
+    properties:
+      total-power-warn-threshold:
+        $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPac"
   tapi.topology.ConnectionSpecReference:
     type: "object"
     properties:
@@ -28102,6 +27998,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
@@ -28125,6 +28025,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -28181,6 +28085,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -28207,6 +28115,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -28261,6 +28173,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -28272,6 +28192,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -28361,6 +28285,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -28416,6 +28344,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -28438,6 +28374,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -28458,6 +28398,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -28483,6 +28427,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -28597,6 +28545,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -28616,6 +28568,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -28653,6 +28609,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -28660,6 +28620,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -28725,6 +28693,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -28808,10 +28780,14 @@ definitions:
           $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.node.OwnedNodeEdgePoint:
     allOf:
-    - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation1"
-    - $ref: "#/definitions/tapi.odu.OwnedNodeEdgePointAugmentation3"
-    - $ref: "#/definitions/tapi.photonic.media.OwnedNodeEdgePointAugmentation2"
+    - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation2"
+    - $ref: "#/definitions/tapi.odu.OwnedNodeEdgePointAugmentation1"
+    - $ref: "#/definitions/tapi.photonic.media.OwnedNodeEdgePointAugmentation3"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -28846,3 +28822,7 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
diff --git a/OAS/tapi-streaming@2020-04-23.yaml b/OAS/tapi-streaming@2020-06-16.yaml
similarity index 86%
rename from OAS/tapi-streaming@2020-04-23.yaml
rename to OAS/tapi-streaming@2020-06-16.yaml
index 01fd5410..c947d1ee 100644
--- a/OAS/tapi-streaming@2020-04-23.yaml
+++ b/OAS/tapi-streaming@2020-06-16.yaml
@@ -1,41 +1,24 @@
 ---
 swagger: "2.0"
 info:
-  description: "This module contains TAPI Streaming Model definitions.\r\n       \
-    \ Source: TapiStreaming.uml\r\n        - The TAPI YANG models included in this\
-    \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
-    \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
-    \ mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
+    \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
+    \ YANG specifications have been generated from the corresponding UML model using\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
-    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
-    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Virtual Network\
-    \ Model definitions.\r\n        Source: TapiVirtualNetwork.uml\r\n        - The\
-    \ TAPI YANG models included in this TAPI release are a *normative* part of the\
-    \ TAPI SDK.\r\n        - The YANG specifications have been generated from the\
-    \ corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n    \
-    \    <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\n        and\
-    \ further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]\r\
-    \n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
-    \n        - Status of YANG model artifacts can be determined by referring to the\
-    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
-    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
-    \n        - The ONF TAPI release process does not guarantee backward compatibility\
-    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
-    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
-    \n        YANG models included in this release may not be backward compatible\
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Path Computation\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Path Computation\
     \ Model definitions.\r\n        Source: TapiPathComputation.uml\r\n        - The\
     \ TAPI YANG models included in this TAPI release are a *normative* part of the\
     \ TAPI SDK.\r\n        - The YANG specifications have been generated from the\
@@ -85,42 +68,24 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
-    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
-    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
-    \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
-    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
-    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
-    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
-    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \     The YANG model backward compatibility criteria are outlined in section 11\
-    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n        YANG models included in this release may not be backward compatible\
-    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
-    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Photonic Media\
-    \ Model definitions.\r\n        Source: TapiPhotonicMedia.uml\r\n        - The\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Virtual Network\
+    \ Model definitions.\r\n        Source: TapiVirtualNetwork.uml\r\n        - The\
     \ TAPI YANG models included in this TAPI release are a *normative* part of the\
     \ TAPI SDK.\r\n        - The YANG specifications have been generated from the\
     \ corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n    \
-    \      <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
-    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
-    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
-    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
-    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \    <https://github.com/OpenNetworkingFoundation/EagleUmlYang>\r\n        and\
+    \ further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]\r\
+    \n        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>\r\
+    \n        - Status of YANG model artifacts can be determined by referring to the\
+    \ corresponding UML artifacts.\r\n        As described in the UML models, some\
+    \ artifacts are considered *experimental*, and thus the corresponding YANG artifacts.\r\
+    \n        - The ONF TAPI release process does not guarantee backward compatibility\
+    \ of YANG models across major versions of TAPI releases.\r\n        The YANG model\
+    \ backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.\r\
+    \n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI ODU Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI ODU Model definitions.\r\
     \n        Source: TapiOdu.uml\r\n        - The TAPI YANG models included in this\
     \ TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG specifications\
     \ have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG\
@@ -154,7 +119,24 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Connectivity Model\
+    \ definitions.\r\n        Source: TapiConnectivity.uml\r\n        - The TAPI YANG\
+    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
+    \n        - The YANG specifications have been generated from the corresponding\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
+    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
     \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
@@ -171,11 +153,12 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
-    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
-    \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Photonic Media\
+    \ Model definitions.\r\n        Source: TapiPhotonicMedia.uml\r\n        - The\
+    \ TAPI YANG models included in this TAPI release are a *normative* part of the\
+    \ TAPI SDK.\r\n        - The YANG specifications have been generated from the\
+    \ corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n    \
+    \      <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
     \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
@@ -221,9 +204,26 @@ info:
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0"
-  version: "2.2.0"
-  title: "tapi-streaming,tapi-virtual-network,tapi-path-computation,tapi-equipment,tapi-dsr,tapi-connectivity,tapi-photonic-media,tapi-odu,tapi-oam,tapi-topology,tapi-notification,tapi-common,tapi-eth\
+    \ the Apache License 2.0,This module contains TAPI Streaming Model definitions.\r\
+    \n        Source: TapiStreaming.uml\r\n        - The TAPI YANG models included\
+    \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
+    \ YANG specifications have been generated from the corresponding UML model using\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n        and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n        As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \     The YANG model backward compatibility criteria are outlined in section 11\
+    \ of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n        YANG models included in this release may not be backward compatible\
+    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
+    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
+    \ the Apache License 2.0."
+  version: "2.1.3"
+  title: "tapi-notification,tapi-path-computation,tapi-equipment,tapi-dsr,tapi-virtual-network,tapi-odu,tapi-oam,tapi-connectivity,tapi-topology,tapi-photonic-media,tapi-common,tapi-eth,tapi-streaming\
     \ API"
 host: "localhost:1234"
 consumes:
@@ -231,7 +231,7 @@ consumes:
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -242,7 +242,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -256,7 +256,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -275,7 +275,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -294,32 +294,21 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/:
-    get:
-      tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityContext"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/name/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.connectivity.context.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -327,18 +316,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/name={value-name}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.connectivity.context.ConnectivityContext.body-param"
-        description: "tapi.connectivity.ConnectivityContext to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -348,373 +365,330 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.context.ConnectivityContext"
-      description: "Augments the base TAPI Context with ConnectivityService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connection={uuid}/:
+  /data/tapi-common:context/service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "creates tapi.common.context.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.common.context.ServiceInterfacePoint.body-param"
+        description: "tapi.common.context.ServiceInterfacePoint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.context.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Connection"
+      - "tapi-common"
+      summary: "returns tapi.common.context.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Connection"
+          description: "tapi.common.context.ServiceInterfacePoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Connection"
+            $ref: "#/definitions/tapi.common.context.ServiceInterfacePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.context.ServiceInterfacePoint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - in: "body"
+        name: "tapi.common.context.ServiceInterfacePoint.body-param"
+        description: "tapi.common.context.ServiceInterfacePoint to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.context.ServiceInterfacePointWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-common"
+      summary: "removes tapi.common.context.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/connection-spec-reference/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "Provides the reference to the spec that defines the connection\
-        \ type and cepRoles."
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
-      description: "An Connection object supports a recursive aggregation relationship\
-        \ such that the internal construction of an Connection can be exposed as multiple\
-        \ lower level Connection objects (partitioning).\r\n                Aggregation\
-        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
-        \              Connection aggregation reflects Node/Topology aggregation.\
-        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
-        \ in an NE is not necessarily the lowest level of FC partitioning."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of lower-connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionRef"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Route"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.Route"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Route"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ResilienceRoute"
-      description: "Provides optional resilience and state attributes to the Route."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ResilienceRoute"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/:
-    get:
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of route"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of supported-client-link"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "link-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of supported-client-link"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LinkRef"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
-    get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControl"
-      description: "none"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "switch-control-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of switch-control"
+        description: "Id of name"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.SwitchControl"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControl"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -723,364 +697,425 @@ paths:
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.ResilienceType"
+          description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
-  : get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.SwitchControlRef"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "switch-control-uuid"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
+          \ be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-uuid"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
+          \ be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of sub-switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "sub-switch-control-switch-control-uuid"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelPoolCapabilityPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of sub-switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.SwitchControlRef"
+          description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPacWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.Switch"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "switch-control-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch-control"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
-      - name: "local-id"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.connectivity.Switch"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.connectivity.Switch"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
-      - name: "value-name"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of name"
+        description: "Id of available-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of switch"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
-      - name: "topology-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
-      - name: "node-uuid"
+        type: "integer"
+        format: "int32"
+      responses:
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "node-edge-point-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of selected-connection-end-point"
+        description: "Id of occupied-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.RouteRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connection"
-        required: true
-        type: "string"
-      - name: "switch-control-uuid"
-        in: "path"
-        description: "Id of switch-control"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of switch"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "connection-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of selected-route"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
-      - name: "route-local-id"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of selected-route"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.connectivity.RouteRef"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.connectivity.RouteRef"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service/:
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
-        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
-          \ be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      - name: "upper-frequency"
+        in: "path"
+        description: "Id of supportable-spectrum"
+        required: true
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
+        in: "path"
+        description: "Id of supportable-spectrum"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.connectivitycontext.ConnectivityService"
+          description: "tapi.photonic.media.PowerManagementCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
         400:
           description: "Internal error"
-    put:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
-        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
-          \ be added or updated"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.connectivitycontext.ConnectivityService"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
         204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
-    get:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionRef"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connection-uuid"
-        in: "path"
-        description: "Id of connection"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.connectivity.ConnectionRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionRef"
         400:
           description: "Internal error"
-  /data/context/connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceRef"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1090,21 +1125,23 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1114,13 +1151,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1128,80 +1167,72 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic/:
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1211,44 +1242,60 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "cost-name"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1256,52 +1303,24 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/:
-    get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connectivity-service-uuid"
-        in: "path"
-        description: "Id of diversity-exclusion"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.connectivity.ConnectivityServiceRef"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connectivity-service-uuid"
-        in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1311,18 +1330,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "connectivity-service-uuid"
-        in: "path"
-        description: "Id of diversity-exclusion"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1330,79 +1345,69 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point/:
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:media-channel-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
-        description: "tapi.connectivity.connectivityservice.EndPoint to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.connectivity.connectivityservice.EndPoint"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
-        description: "tapi.connectivity.connectivityservice.EndPoint to be added or\
-          \ updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1412,18 +1417,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.connectivityservice.EndPoint"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1431,52 +1432,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+  /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.photonic.media.OtsiServiceInterfacePointSpec"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -1486,26 +1478,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
+        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -1515,18 +1503,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.Capacity"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiServiceInterfacePointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1534,155 +1517,171 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
+  /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/:
     get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.photonic.media.OtsiCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.photonic.media.OtsiCapabilityPacWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/supportable-application-identifier={application-code}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "The list of supportable ApplicationIdentifiers."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "application-code"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supportable-application-identifier"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.ApplicationIdentifier"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/supportable-central-frequency-spectrum-band={lower-central-frequency},{upper-central-frequency}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequencyBand"
+      description: "Each spectrum band supported for otsi trasmitter to be tuned on,\r\
+        \n                is specified as per it's lower and upper central frequencies\
+        \ supported and its frequency constraints,\r\n                consisting in\
+        \ the frequency Grid and the AdjustmentGranularity,\r\n                used\
+        \ to uniquely identify all central frequencies supported within the band."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "lower-central-frequency"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supportable-central-frequency-spectrum-band"
         required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+        type: "integer"
+        format: "int32"
+      - name: "upper-central-frequency"
+        in: "path"
+        description: "Id of supportable-central-frequency-spectrum-band"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.CentralFrequencyBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyBandWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/supportable-central-frequency-spectrum-band={lower-central-frequency},{upper-central-frequency}/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.BandwidthProfile"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "lower-central-frequency"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supportable-central-frequency-spectrum-band"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
+      - name: "upper-central-frequency"
+        in: "path"
+        description: "Id of supportable-central-frequency-spectrum-band"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/otsi-capability/total-power-warn-threshold/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.TotalPowerThresholdPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.photonic.media.TotalPowerThresholdPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerManagementCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -1692,26 +1691,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
+        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -1721,18 +1716,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1740,52 +1730,46 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1795,26 +1779,23 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1824,18 +1805,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1843,52 +1821,46 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1898,26 +1870,23 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -1927,18 +1896,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum output power supported\r\n\
+        \                at the Logical-Termination-Point (LTP) associated to the\
+        \ SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -1946,52 +1912,44 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -2001,26 +1959,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -2030,18 +1984,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the maximum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -2049,54 +1999,44 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/service-interface-point={uuid}/tapi-photonic-media:otsi-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -2106,27 +2046,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -2136,19 +2071,14 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter exposes the minimum input power tolerated\r\n \
+        \               at the Logical-Termination-Point (LTP) associated to the SIP."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
@@ -2156,205 +2086,167 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
+    get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
-          \ to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec\
-          \ to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/capacity/
-  : get:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+    get:
       tags:
-      - "tapi-photonic-media"
+      - "tapi-common"
       summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectivityContext"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters:
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.connectivity.context.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -2364,28 +2256,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.connectivity.context.ConnectivityContext.body-param"
+        description: "tapi.connectivity.ConnectivityContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -2395,187 +2275,127 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
-        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
-        \ be omitted if spectrum is not specified."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.context.ConnectivityContext"
+      description: "Augments the base TAPI Context with ConnectivityService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config/
-  : post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Connection"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.Connection"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.photonic.media.MediaChannelConfigPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "node-edge-point-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-end-point-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/connection-spec-reference/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "Provides the reference to the spec that defines the connection\
+        \ type and cepRoles."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
+        description: "Id of connection"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name/
-  : post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/lower-connection={connection-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "An Connection object supports a recursive aggregation relationship\
+        \ such that the internal construction of an Connection can be exposed as multiple\
+        \ lower level Connection objects (partitioning).\r\n                Aggregation\
+        \ is used as for the Node/Topology  to allow changes in hierarchy. \r\n  \
+        \              Connection aggregation reflects Node/Topology aggregation.\
+        \ \r\n                The FC represents a Cross-Connection in an NE. The Cross-Connection\
+        \ in an NE is not necessarily the lowest level of FC partitioning."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of lower-connection"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/name={value-name}/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-photonic-media"
+      - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -2583,17 +2403,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "value-name"
@@ -2605,399 +2415,472 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Route"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.Route"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of route"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.ConnectionEndPointRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
-      - name: "value-name"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ResilienceRoute"
+      description: "Provides optional resilience and state attributes to the Route."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of route"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ResilienceRoute"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ResilienceRouteWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/route={local-id}/resilience-route-pac/name={value-name}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of route"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementConfigPac"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/supported-client-link={topology-uuid},{link-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of supported-client-link"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "link-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of supported-client-link"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.LinkRef"
+          schema:
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.SwitchControl"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.SwitchControl"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchControlWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-maximum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/resilience-type/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.ResilienceType"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of switch-control"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/sub-switch-control={connection-uuid},{sub-switch-control-switch-control-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.SwitchControlRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of sub-switch-control"
+        required: true
+        type: "string"
+      - name: "sub-switch-control-switch-control-uuid"
+        in: "path"
+        description: "Id of sub-switch-control"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.SwitchControlRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchControlRefWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.Switch"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "switch-control-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch-control"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "local-id"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of switch"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.connectivity.Switch"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.SwitchWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-minimum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "topology-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of selected-connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of selected-connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of selected-connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of selected-connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connection={uuid}/switch-control={switch-control-uuid}/switch={local-id}/selected-route={connection-uuid},{route-local-id}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.RouteRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of connection"
+        required: true
+        type: "string"
+      - name: "switch-control-uuid"
+        in: "path"
+        description: "Id of switch-control"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of switch"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of selected-route"
+        required: true
+        type: "string"
+      - name: "route-local-id"
+        in: "path"
+        description: "Id of selected-route"
         required: true
         type: "string"
+      responses:
+        200:
+          description: "tapi.connectivity.RouteRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.RouteRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
+      parameters:
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
+        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
+          \ be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -3005,35 +2888,43 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.connectivitycontext.ConnectivityService"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.connectivitycontext.ConnectivityService.body-param"
+        description: "tapi.connectivity.connectivitycontext.ConnectivityService to\
+          \ be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -3043,92 +2934,80 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.connectivitycontext.ConnectivityService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-maximum-output-power/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/connection={connection-uuid}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connection-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connection"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.ConnectionRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectionRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/coroute-inclusion/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectivityServiceRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3138,33 +3017,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -3174,168 +3041,176 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-minimum-output-power/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic/:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/cost-characteristic={cost-name}/:
+    get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-    post:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "cost-name"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/diversity-exclusion={connectivity-service-uuid}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.connectivity.ConnectivityServiceRef"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3343,27 +3218,28 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "mc-config-local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.connectivity.ConnectivityServiceRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceRef to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRefWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3371,22 +3247,35 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connectivity-service-uuid"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of diversity-exclusion"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.connectivityservice.EndPoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
+        description: "tapi.connectivity.connectivityservice.EndPoint to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -3394,10 +3283,11 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.connectivityservice.EndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3410,17 +3300,36 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
+      responses:
+        200:
+          description: "tapi.connectivity.connectivityservice.EndPoint"
+          schema:
+            $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.connectivityservice.EndPoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mc-config"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.connectivity.connectivityservice.EndPoint.body-param"
+        description: "tapi.connectivity.connectivityservice.EndPoint to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -3430,8 +3339,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.connectivityservice.EndPoint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3444,21 +3353,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-aconnectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/frequency-constraint/
-  : get:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3471,22 +3375,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3499,17 +3398,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3519,8 +3413,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3533,17 +3427,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -3553,8 +3442,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3567,21 +3456,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "mc-config-local-id"
-        in: "path"
-        description: "Id of mc-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3596,15 +3480,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3618,12 +3502,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
-          \ to be added to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3633,8 +3516,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3648,12 +3531,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
-          \ to be added or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -3663,8 +3545,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3682,11 +3564,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3701,15 +3583,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConfigPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3723,11 +3605,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3737,8 +3619,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3752,11 +3634,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
-        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3766,8 +3648,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3785,14 +3667,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3804,27 +3684,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/name={value-name}/
-  : get:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3836,25 +3707,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3866,17 +3736,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3886,11 +3751,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -3902,21 +3765,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3931,15 +3789,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementConfigPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3953,12 +3811,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
-          \ list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3968,8 +3825,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -3983,12 +3840,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
-          \ updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -3998,8 +3854,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4017,14 +3873,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-maximum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4038,18 +3892,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4062,11 +3914,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4076,13 +3928,11 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
-      parameters:
-      - name: "uuid"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
@@ -4093,11 +3943,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4107,11 +3957,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4128,14 +3976,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-minimum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/capacity/total-size/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4149,18 +3996,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4173,11 +4019,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4187,11 +4033,10 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4204,11 +4049,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4218,11 +4063,10 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4239,14 +4083,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-maximum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/connection-end-point={topology-uuid},{node-uuid},{node-edge-point-uuid},{connection-end-point-uuid}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4258,20 +4100,41 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4284,11 +4147,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4296,13 +4159,44 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4314,12 +4208,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -4329,11 +4228,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -4345,19 +4244,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-minimum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4371,18 +4273,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4395,11 +4295,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4409,11 +4310,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4426,11 +4325,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4440,11 +4340,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4461,11 +4359,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4480,15 +4378,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4502,11 +4400,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4516,8 +4415,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4531,11 +4430,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4545,8 +4445,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4564,11 +4464,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4583,15 +4483,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4605,11 +4505,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4619,8 +4520,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4634,11 +4535,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4648,8 +4550,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      - "tapi-connectivity"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4667,11 +4569,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4686,15 +4588,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementConfigPac"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4708,12 +4610,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
-          \ list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4723,8 +4624,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4738,12 +4639,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
-        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
-          \ updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -4753,8 +4653,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -4772,14 +4672,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-maximum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4793,18 +4691,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4817,11 +4713,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -4831,11 +4727,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4848,11 +4742,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -4862,11 +4756,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4883,14 +4775,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/expected-minimum-input-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-common-pac/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4904,18 +4794,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduCsepCommonPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4928,11 +4816,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -4942,11 +4830,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4959,11 +4845,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduCsepCommonPac.body-param"
+        description: "tapi.odu.OduCsepCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -4973,11 +4859,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum input power\r\
-        \n                being received at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -4994,14 +4878,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-maximum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5015,18 +4897,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduCsepCtpPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5039,11 +4919,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5053,11 +4933,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5070,11 +4948,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduCsepCtpPac.body-param"
+        description: "tapi.odu.OduCsepCtpPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepCtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5084,11 +4962,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the maximum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5105,14 +4981,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/media-channel-connectivity-service-end-point-spec/power-management-config/intended-minimum-output-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-odu:odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5126,18 +5000,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.odu.OduCsepTtpPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5150,11 +5022,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5164,11 +5036,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5181,11 +5051,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.odu.OduCsepTtpPac.body-param"
+        description: "tapi.odu.OduCsepTtpPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.odu.OduCsepTtpPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5195,11 +5065,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter shall be used to specify the minimum output power\r\
-        \n                desired at the Logical-Termination-Point (LTP) associated\
-        \ to the CSEP."
+      - "tapi-odu"
+      summary: "removes tapi.odu.OduCsepTtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5216,14 +5084,35 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name/:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper"
+        400:
+          description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5236,11 +5125,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.photonic.media.McaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.McaConnectivityServiceEndPointSpec to be\
+          \ added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -5248,14 +5138,11 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+    put:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5267,47 +5154,13 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of connectivity-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.McaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.McaConnectivityServiceEndPointSpec to be\
+          \ added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -5317,11 +5170,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.McaConnectivityServiceEndPointSpec"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -5333,22 +5184,19 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/capacity/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5362,16 +5210,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectivityServiceEndPointSpec"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5384,11 +5234,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5398,9 +5248,11 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5413,11 +5265,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.odu.OduConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.odu.OduConnectivityServiceEndPointSpec to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5427,9 +5279,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduConnectivityServiceEndPointSpec"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of an MCA/OTSiMCA.\r\n                Capacity\
+        \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
+        \ be omitted if spectrum is not specified."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5446,11 +5300,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-common-pac/
-  : get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config/
+  : post:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5463,17 +5317,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
-        200:
-          description: "tapi.odu.OduCsepCommonPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5486,23 +5347,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.MediaChannelConfigPac"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5515,12 +5375,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCommonPac.body-param"
-        description: "tapi.odu.OduCsepCommonPac to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5530,8 +5395,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCommonPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5544,17 +5409,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ctp-pac/
-  : get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/name/
+  : post:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5566,18 +5438,32 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.odu.OduCsepCtpPac"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/name={value-name}/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5589,24 +5475,30 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5618,12 +5510,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepCtpPac.body-param"
-        description: "tapi.odu.OduCsepCtpPac to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5633,9 +5535,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepCtpPac"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5647,16 +5551,26 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/odu-connectivity-service-end-point-spec/odu-csep-ttp-pac/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5669,17 +5583,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCsepTtpPac"
+          description: "tapi.photonic.media.PowerManagementConfigPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-odu"
-      summary: "creates tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5692,12 +5611,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added to list"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5707,8 +5632,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-odu"
-      summary: "creates or updates tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5721,12 +5646,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.odu.OduCsepTtpPac.body-param"
-        description: "tapi.odu.OduCsepTtpPac to be added or updated"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5736,8 +5667,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-odu"
-      summary: "removes tapi.odu.OduCsepTtpPac"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -5750,17 +5681,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-maximum-input-power/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5772,18 +5710,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5795,13 +5740,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
-          \ be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5812,8 +5761,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5825,13 +5776,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec to\
-          \ be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5842,8 +5797,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5855,17 +5812,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/expected-minimum-input-power/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5877,26 +5841,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      - name: "mc-config-local-id"
+        in: "path"
+        description: "Id of mc-config"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.PowerProperties"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/
-  : get:
+    post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5908,23 +5871,31 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.OtsiTerminationConfigPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5936,18 +5907,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
-          \ updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -5958,8 +5928,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5971,9 +5943,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -5981,12 +5953,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/application-identifier/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-maximum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -5998,23 +5972,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.ApplicationIdentifier"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6026,17 +6002,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6047,8 +6023,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6060,17 +6038,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6081,8 +6059,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6094,9 +6074,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6104,13 +6084,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/power-management-config-pac/intended-minimum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6122,24 +6103,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.CentralFrequency"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6151,17 +6133,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6172,9 +6154,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6186,17 +6169,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -6207,9 +6190,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6221,9 +6205,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6231,11 +6215,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6248,22 +6232,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6276,17 +6260,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -6297,7 +6281,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6310,17 +6294,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -6331,7 +6315,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      summary: "removes tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6344,9 +6328,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6354,14 +6338,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:mca-connectivity-service-end-point-spec/mc-config={mc-config-local-id}/spectrum/frequency-constraint/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6373,32 +6355,23 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of mc-config"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.FrequencyConstraint"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name={value-name}/
-  : get:
+    post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6410,30 +6383,29 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6445,22 +6417,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -6471,10 +6438,8 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -6486,14 +6451,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
-      - name: "value-name"
+      - name: "mc-config-local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of mc-config"
         required: true
         type: "string"
       responses:
@@ -6501,11 +6461,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6518,22 +6478,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      summary: "creates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6546,17 +6501,13 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -6567,7 +6518,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6580,17 +6531,13 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec\
+          \ to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -6601,7 +6548,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      summary: "removes tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6614,21 +6561,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6641,22 +6583,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.MediaChannelConfigPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6669,17 +6606,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6690,7 +6622,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates or updates tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6703,17 +6635,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.MediaChannelConfigPac.body-param"
+        description: "tapi.photonic.media.MediaChannelConfigPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6724,7 +6651,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      summary: "removes tapi.photonic.media.MediaChannelConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6737,22 +6664,19 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-aconnectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/transmit-power/
-  : get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/name/
+  : post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6764,23 +6688,27 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
-        in: "path"
-        description: "Id of otsi-config"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/name={value-name}/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6792,29 +6720,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6826,17 +6750,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6847,8 +6771,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6860,9 +6786,9 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "otsi-config-local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of otsi-config"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -6870,11 +6796,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "returns tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6889,15 +6815,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+          description: "tapi.photonic.media.PowerManagementConfigPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "creates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6911,12 +6837,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
-          \ added to list"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6927,7 +6853,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "creates or updates tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6941,12 +6867,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
-        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
-          \ added or updated"
+        name: "tapi.photonic.media.PowerManagementConfigPac.body-param"
+        description: "tapi.photonic.media.PowerManagementConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+          $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -6957,7 +6883,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+      summary: "removes tapi.photonic.media.PowerManagementConfigPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -6975,12 +6901,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-maximum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -6994,16 +6922,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiTerminationConfigPac"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7016,12 +6946,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
-          \ list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7032,8 +6961,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7046,12 +6977,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
-        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
-          \ updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7062,8 +6992,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7080,12 +7012,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/application-identifier/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/expected-minimum-input-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7099,16 +7033,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.ApplicationIdentifier"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7121,11 +7057,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7136,8 +7072,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7150,11 +7088,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
-        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7165,8 +7103,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.ApplicationIdentifier"
-      description: "This attribute indicates the selected Application Identifier."
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum input power\r\
+        \n                being received at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7183,13 +7123,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-maximum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7203,17 +7144,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.CentralFrequency"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7226,11 +7168,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7241,9 +7183,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7256,11 +7199,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.CentralFrequency.body-param"
-        description: "tapi.photonic.media.CentralFrequency to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7271,9 +7214,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.CentralFrequency"
-      description: "The central frequency of the laser. It is the oscillation frequency\
-        \ of the corresponding electromagnetic wave"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the maximum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7290,12 +7234,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/power-management-config-pac/intended-minimum-output-power/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "returns tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7309,16 +7255,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.PowerProperties"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7331,11 +7279,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7346,8 +7294,10 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "creates or updates tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7360,11 +7310,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.PowerProperties.body-param"
+        description: "tapi.photonic.media.PowerProperties to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesWrapper"
       responses:
         201:
           description: "Object created"
@@ -7375,8 +7325,10 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      summary: "removes tapi.photonic.media.PowerProperties"
+      description: "This parameter shall be used to specify the minimum output power\r\
+        \n                desired at the Logical-Termination-Point (LTP) associated\
+        \ to the CSEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7393,14 +7345,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name/
-  : post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/spectrum/
+  : get:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7412,27 +7362,18 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/name={value-name}/
-  : get:
+    post:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7444,25 +7385,24 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
+      responses:
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7474,17 +7414,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -7495,10 +7430,8 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7510,21 +7443,16 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/spectrum/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:media-channel-connectivity-service-end-point-spec/mc-config/spectrum/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7539,15 +7467,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.SpectrumBand"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7561,11 +7489,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -7576,7 +7504,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7590,11 +7518,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.SpectrumBand.body-param"
-        description: "tapi.photonic.media.SpectrumBand to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -7605,7 +7533,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.SpectrumBand"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7623,11 +7551,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7642,15 +7570,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7664,11 +7592,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
+        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
+          \ added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -7679,7 +7608,7 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
+      summary: "creates or updates tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7693,11 +7622,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.FrequencyConstraint.body-param"
-        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
+        name: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiConnectivityServiceEndPointSpec to be\
+          \ added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+          $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -7708,7 +7638,7 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.FrequencyConstraint"
+      summary: "removes tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -7726,12 +7656,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/otsi-connectivity-service-end-point-spec/otsi-config/transmit-power/
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7745,16 +7675,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
+          description: "tapi.photonic.media.OtsiTerminationConfigPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7767,11 +7697,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -7782,8 +7713,8 @@ paths:
     put:
       tags:
       - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7796,11 +7727,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
-        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -7811,8 +7743,8 @@ paths:
     delete:
       tags:
       - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerPropertiesPac"
-      description: "Transmit power as requested."
+      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7829,12 +7761,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/peer-fwd-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/application-identifier/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7848,16 +7780,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.photonic.media.ApplicationIdentifier"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7870,12 +7802,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -7885,9 +7816,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7900,12 +7831,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -7915,9 +7845,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
@@ -7934,12 +7864,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/protecting-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7953,16 +7884,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.photonic.media.CentralFrequency"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -7975,12 +7907,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -7990,9 +7921,10 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -8005,12 +7937,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -8020,9 +7951,10 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
@@ -8039,11 +7971,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/server-connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/central-frequency/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8058,15 +7990,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8080,12 +8012,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8095,8 +8026,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8110,12 +8041,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8125,8 +8055,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8144,12 +8074,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/name/
+  : post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8161,18 +8093,27 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.common.ServiceInterfacePointRef"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/name={value-name}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8184,24 +8125,25 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8213,12 +8155,17 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8228,9 +8175,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -8242,85 +8191,91 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/spectrum/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.photonic.media.SpectrumBand"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+    post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -8330,19 +8285,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -8350,11 +8304,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/spectrum/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8362,17 +8316,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8380,12 +8339,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8395,8 +8359,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8404,12 +8368,17 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8419,8 +8388,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8428,47 +8397,62 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsi-connectivity-service-end-point-spec/otsi-config/transmit-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8478,21 +8462,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8502,25 +8491,30 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8528,17 +8522,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8546,12 +8545,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec to\
+          \ be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -8561,8 +8566,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8570,12 +8575,18 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec.body-param"
+        description: "tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec to\
+          \ be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper"
       responses:
         201:
           description: "Object created"
@@ -8585,8 +8596,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8594,31 +8605,40 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config/
+  : post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8626,56 +8646,63 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.photonic.media.OtsiTerminationConfigPac"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.photonic.media.OtsiTerminationConfigPac.body-param"
+        description: "tapi.photonic.media.OtsiTerminationConfigPac to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -8685,20 +8712,23 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.OtsiTerminationConfigPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       responses:
@@ -8706,42 +8736,62 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/application-identifier/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.photonic.media.ApplicationIdentifier"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -8751,21 +8801,31 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.photonic.media.ApplicationIdentifier.body-param"
+        description: "tapi.photonic.media.ApplicationIdentifier to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
       responses:
         201:
           description: "Object created"
@@ -8775,56 +8835,88 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.Capacity"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.ApplicationIdentifier"
+      description: "This attribute indicates the selected Application Identifier."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.photonic.media.CentralFrequency"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -8834,21 +8926,32 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
+        name: "tapi.photonic.media.CentralFrequency.body-param"
+        description: "tapi.photonic.media.CentralFrequency to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
       responses:
         201:
           description: "Object created"
@@ -8858,25 +8961,36 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.BandwidthProfile"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.CentralFrequency"
+      description: "The central frequency of the laser. It is the oscillation frequency\
+        \ of the corresponding electromagnetic wave"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/central-frequency/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8884,17 +8998,27 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8902,12 +9026,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8917,8 +9051,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8926,12 +9060,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -8941,8 +9085,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -8950,47 +9094,51 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name/
+  : post:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of connectivity-service"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -8998,23 +9146,76 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9024,25 +9225,42 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-photonic-media"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9050,17 +9268,27 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9068,12 +9296,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -9083,8 +9321,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9092,12 +9330,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.SpectrumBand.body-param"
+        description: "tapi.photonic.media.SpectrumBand to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
       responses:
         201:
           description: "Object created"
@@ -9107,8 +9355,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9116,16 +9364,26 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/spectrum/frequency-constraint/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9133,17 +9391,27 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9151,12 +9419,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9166,8 +9444,8 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9175,12 +9453,22 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.photonic.media.FrequencyConstraint.body-param"
+        description: "tapi.photonic.media.FrequencyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -9190,8 +9478,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9199,37 +9487,151 @@ paths:
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/end-point={local-id}/tapi-photonic-media:otsia-connectivity-service-end-point-spec/otsi-config={otsi-config-local-id}/transmit-power/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-photonic-media"
+      summary: "creates or updates tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.photonic.media.PowerPropertiesPac.body-param"
+        description: "tapi.photonic.media.PowerPropertiesPac to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-photonic-media"
+      summary: "removes tapi.photonic.media.PowerPropertiesPac"
+      description: "Transmit power as requested."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - name: "otsi-config-local-id"
+        in: "path"
+        description: "Id of otsi-config"
+        required: true
+        type: "string"
+      responses:
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
@@ -9237,11 +9639,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9249,24 +9651,54 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/latency-characteristic={traffic-property-name}/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.LatencyCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -9277,25 +9709,30 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-cost/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.ResilienceType"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9305,15 +9742,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.topology.ResilienceType"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.ResilienceType"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9322,11 +9759,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.ResilienceType.body-param"
-        description: "tapi.topology.ResilienceType to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9337,7 +9774,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.ResilienceType"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9346,11 +9783,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.ResilienceType.body-param"
-        description: "tapi.topology.ResilienceType to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.ResilienceType"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9361,7 +9798,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.ResilienceType"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9374,77 +9811,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
-    post:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-delay/:
+    get:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.path.computation.ValueOrPriority"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
+    post:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9455,29 +9881,24 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.topology.RiskCharacteristic"
-      description: "none"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/connectivity-context/connectivity-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/max-allowed-hops/:
     get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.common.TimeRange"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9487,15 +9908,15 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimeRange"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-connectivity"
-      summary: "creates tapi.common.TimeRange"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9504,11 +9925,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9519,7 +9940,7 @@ paths:
     put:
       tags:
       - "tapi-connectivity"
-      summary: "creates or updates tapi.common.TimeRange"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9528,11 +9949,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimeRange.body-param"
-        description: "tapi.common.TimeRange to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9543,7 +9964,7 @@ paths:
     delete:
       tags:
       - "tapi-connectivity"
-      summary: "removes tapi.common.TimeRange"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
@@ -9556,21 +9977,26 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-connectivity"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
         name: "tapi.common.NameAndValue.body-param"
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9578,15 +10004,20 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
+      - "tapi-connectivity"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9596,17 +10027,22 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-connectivity"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9617,7 +10053,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9627,12 +10063,17 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-connectivity"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
         \ no semantics with respect to the purpose of the entity."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - name: "value-name"
         in: "path"
         description: "Id of name"
@@ -9643,32 +10084,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-connectivity"
+      summary: "returns tapi.common.Capacity"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationContext"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.Capacity"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9678,16 +10129,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.Capacity"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -9697,73 +10153,80 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-connectivity"
+      summary: "removes tapi.common.Capacity"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
-        200:
-          description: "tapi.notification.NotificationSubscriptionService"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -9773,13 +10236,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -9787,26 +10250,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-burst-size/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9814,56 +10293,106 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
-    get:
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/committed-information-rate/
+  : get:
+      tags:
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -9873,20 +10402,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -9894,277 +10416,295 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.notification.Notification"
-          schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "notification-uuid"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.notification.NameAndValueChange"
-          schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/requested-capacity/total-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "notification-uuid"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-connectivity"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/resilience-type/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.SubscriptionFilter"
+          description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.topology.ResilienceType.body-param"
+        description: "tapi.topology.ResilienceType to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -10174,21 +10714,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.topology.ResilienceType.body-param"
+        description: "tapi.topology.ResilienceType to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
       responses:
         201:
           description: "Object created"
@@ -10198,13 +10738,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.ResilienceType"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
@@ -10212,26 +10752,24 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10239,56 +10777,52 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -10298,20 +10832,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-connectivity"
+      summary: "removes tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "risk-characteristic-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
@@ -10319,187 +10851,115 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service={uuid}/schedule/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-connectivity"
+      summary: "returns tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
-    get:
+    post:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-connectivity"
+      summary: "creates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
-        200:
-          description: "tapi.notification.AlarmInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-connectivity"
+      summary: "creates or updates tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.NameAndValueChange"
-          schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.TimeRange.body-param"
+        description: "tapi.common.TimeRange to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-connectivity"
+      summary: "removes tapi.common.TimeRange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
+        description: "Id of connectivity-service"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-equipment:physical-context/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PhysicalContext"
       description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
       parameters: []
       responses:
         200:
-          description: "tapi.oam.context.OamContext"
+          description: "tapi.equipment.PhysicalContext"
           schema:
-            $ref: "#/definitions/tapi.oam.context.OamContext"
+            $ref: "#/definitions/tapi.equipment.PhysicalContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
+      - "tapi-equipment"
+      summary: "creates tapi.equipment.PhysicalContext"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.oam.context.OamContext.body-param"
-        description: "tapi.oam.context.OamContext to be added to list"
+        name: "tapi.equipment.PhysicalContext.body-param"
+        description: "tapi.equipment.PhysicalContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.context.OamContext"
+          $ref: "#/definitions/tapi.equipment.PhysicalContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -10509,16 +10969,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
+      - "tapi-equipment"
+      summary: "creates or updates tapi.equipment.PhysicalContext"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.oam.context.OamContext.body-param"
-        description: "tapi.oam.context.OamContext to be added or updated"
+        name: "tapi.equipment.PhysicalContext.body-param"
+        description: "tapi.equipment.PhysicalContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.context.OamContext"
+          $ref: "#/definitions/tapi.equipment.PhysicalContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -10528,205 +10988,143 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.context.OamContext"
-      description: "Augments the base TAPI Context with OamService information"
+      - "tapi-equipment"
+      summary: "removes tapi.equipment.PhysicalContext"
+      description: "none"
       parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/meg={uuid}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.oamcontext.Meg"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.Device"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.oamcontext.Meg"
+          description: "tapi.equipment.Device"
           schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.Meg"
+            $ref: "#/definitions/tapi.equipment.DeviceWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/eth-meg-spec/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMegSpec"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AccessPort"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.eth.EthMegSpec"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthMegSpec"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.meg.Mep"
-      description: "1. ME may have 0 MEPs (case of transit domains where at least\
-        \ 1 MIP is present)\r\n                2. ME may have 1 MEP (case of edge\
-        \ domaind, where the peer MEP is ouside the managed domain)\r\n          \
-        \      3. ME may have 2 MEPs"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of access-port"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.meg.Mep"
+          description: "tapi.equipment.AccessPort"
           schema:
-            $ref: "#/definitions/tapi.oam.meg.Mep"
+            $ref: "#/definitions/tapi.equipment.AccessPortWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMepSpec"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ConnectorPinAddress"
+      description: "The list of Pins that support the AccessPort."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of mep"
+        description: "Id of device"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.eth.EthMepSpec"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthMepSpec"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-common/:
-    get:
-      tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMepCommon"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of access-port"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "connector-identification"
         in: "path"
-        description: "Id of mep"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.eth.EthMepCommon"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthMepCommon"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-sink/:
-    get:
-      tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMepSink"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "pin-identification"
         in: "path"
-        description: "Id of meg"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthMepSink"
+          description: "tapi.equipment.ConnectorPinAddress"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMepSink"
+            $ref: "#/definitions/tapi.equipment.ConnectorPinAddressWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-sink/bandwidth-report/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.BandwidthReport"
-      description: "This attribute models the content of the bandwidth report received\
-        \ by the MEP Sink from the peer MEP Source."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PinAndRole"
+      description: "If there is more than one pin used in a connector and/or there\
+        \ is a need to identify the role of one or more pins then this property can\
+        \ be used.\r\n                For simple cases pinIdentification can be used\
+        \ instead."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of access-port"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.eth.BandwidthReport"
-          schema:
-            $ref: "#/definitions/tapi.eth.BandwidthReport"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/eth-mep-spec/eth-mep-source-pac/:
-    get:
-      tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMepSource"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "connector-identification"
         in: "path"
-        description: "Id of meg"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "pin-identification"
         in: "path"
-        description: "Id of mep"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthMepSource"
+          description: "tapi.equipment.PinAndRole"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMepSource"
+            $ref: "#/definitions/tapi.equipment.PinAndRoleWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/access-port={access-port-uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-oam"
+      - "tapi-equipment"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -10734,12 +11132,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "access-port-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of access-port"
         required: true
         type: "string"
       - name: "value-name"
@@ -10751,464 +11149,540 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/:
     get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectionEndPointSpec"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.Equipment"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectionEndPointSpec"
+          description: "tapi.equipment.Equipment"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.equipment.EquipmentWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-common/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/:
     get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCommonPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ActualEquipment"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCommonPac"
+          description: "tapi.equipment.ActualEquipment"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCommonPac"
+            $ref: "#/definitions/tapi.equipment.ActualEquipmentWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-ctp/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCtpPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ActualNonFieldReplaceableModule"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCtpPac"
+          description: "tapi.equipment.ActualNonFieldReplaceableModule"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCtpPac"
+            $ref: "#/definitions/tapi.equipment.ActualNonFieldReplaceableModuleWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-protection/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-actual-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduProtectionPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonActualProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduProtectionPac"
+          description: "tapi.equipment.CommonActualProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.OduProtectionPac"
+            $ref: "#/definitions/tapi.equipment.CommonActualPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-equipment-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-actual-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPayloadType"
-      description: "This attribute is applicable when the ODU CTP object instance\
-        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
-        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
-        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
-        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
-        \ G.709 with one additional value UN_INTERPRETABLE."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonActualProperties"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduPayloadType"
+          description: "tapi.equipment.CommonActualProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPayloadType"
+            $ref: "#/definitions/tapi.equipment.CommonActualPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mep={local-id}/odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-equipment-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.FecProperties"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.FecProperties"
+          description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.FecProperties"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.meg.Mip"
-      description: "ME may 0, 1, or more MIPs"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.Holder"
+      description: "References the Holder in an Equipment that is available to take\
+        \ other Equipments.\r\n                For example:\r\n                - Slot\
+        \ in a sub-rack\r\n                - Slot in a Field Replaceable Unit that\
+        \ can take a small form-factor pluggable."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
+        required: true
+        type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.meg.Mip"
+          description: "tapi.equipment.Holder"
           schema:
-            $ref: "#/definitions/tapi.oam.meg.Mip"
+            $ref: "#/definitions/tapi.equipment.HolderWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/eth-mip-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthMipSpec"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ActualHolder"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
+        required: true
+        type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthMipSpec"
+          description: "tapi.equipment.ActualHolder"
           schema:
-            $ref: "#/definitions/tapi.eth.EthMipSpec"
+            $ref: "#/definitions/tapi.equipment.ActualHolderWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/common-holder-properties/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonHolderProperties"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "contained-holder-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.equipment.CommonHolderProperties"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.equipment.CommonHolderPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduMipSpec"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ExpectedHolder"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
+        required: true
+        type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduMipSpec"
+          description: "tapi.equipment.ExpectedHolder"
           schema:
-            $ref: "#/definitions/tapi.odu.OduMipSpec"
+            $ref: "#/definitions/tapi.equipment.ExpectedHolderWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-defect/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/common-holder-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduDefectPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonHolderProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
+        required: true
+        type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduDefectPac"
+          description: "tapi.equipment.CommonHolderProperties"
+          schema:
+            $ref: "#/definitions/tapi.equipment.CommonHolderPropertiesWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-equipment"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
+        required: true
+        type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/occupying-fru/
+  : get:
+      tags:
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.EquipmentRef"
+      description: "The FRU that is occupying the holder. \r\n                A holder\
+        \ may be unoccupied. \r\n                An FRU may occupy more hat one holder\
+        \ (using or blocking are intentionally not distinguished here)."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
+        required: true
+        type: "string"
+      - name: "contained-holder-uuid"
+        in: "path"
+        description: "Id of contained-holder"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.equipment.EquipmentRef"
           schema:
-            $ref: "#/definitions/tapi.odu.OduDefectPac"
+            $ref: "#/definitions/tapi.equipment.EquipmentRefWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-mip/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/:
     get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduMipPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ExpectedEquipment"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduMipPac"
+          description: "tapi.equipment.ExpectedEquipment"
           schema:
-            $ref: "#/definitions/tapi.odu.OduMipPac"
+            $ref: "#/definitions/tapi.equipment.ExpectedEquipmentWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-mip/deg-thr/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/common-equipment-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.DegThr"
-      description: "This attribute indicates the threshold level for declaring a performance\
-        \ monitoring (PM) Second to be bad. The value of the threshold can be provisioned\
-        \ in terms of number of errored blocks or in terms of percentage of errored\
-        \ blocks. For percentage-based specification, in order to support provision\
-        \ of less than 1%, the specification consists of two fields. The first field\
-        \ indicates the granularity of percentage. For examples, in 1%, in 0.1%, or\
-        \ in 0.01%, etc. The second field indicates the multiple of the granularity.\
-        \ For number of errored block based, the value is a positive integer."
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.DegThr"
+          description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.DegThr"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-ncm/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduNcmPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ExpectedHolder"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduNcmPac"
+          description: "tapi.equipment.ExpectedHolder"
           schema:
-            $ref: "#/definitions/tapi.odu.OduNcmPac"
+            $ref: "#/definitions/tapi.equipment.ExpectedHolderWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-pm/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/common-holder-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPmPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonHolderProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduPmPac"
+          description: "tapi.equipment.CommonHolderProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPmPac"
+            $ref: "#/definitions/tapi.equipment.CommonHolderPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-pm/uas/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.UasChoice"
-      description: "UnAvailable Second"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ExpectedNonFieldReplaceableModule"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.UasChoice"
+          description: "tapi.equipment.ExpectedNonFieldReplaceableModule"
           schema:
-            $ref: "#/definitions/tapi.odu.UasChoice"
+            $ref: "#/definitions/tapi.equipment.ExpectedNonFieldReplaceableModuleWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/mip={local-id}/odu-mip-spec/odu-tcm/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/common-equipment-properties/
+  : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduTcmMipPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.CommonEquipmentProperties"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "equipment-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of equipment"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduTcmMipPac"
+          description: "tapi.equipment.CommonEquipmentProperties"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTcmMipPac"
+            $ref: "#/definitions/tapi.equipment.CommonEquipmentPropertiesWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/meg={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/equipment={equipment-uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-oam"
+      - "tapi-equipment"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -11216,7 +11690,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of meg"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of equipment"
         required: true
         type: "string"
       - name: "value-name"
@@ -11228,22 +11707,50 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-equipment:physical-context/device={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-equipment"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of device"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job/:
+  /data/tapi-common:context/tapi-equipment:physical-context/name/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.oamcontext.OamJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - in: "body"
-        name: "tapi.oam.oamcontext.OamJob.body-param"
-        description: "tapi.oam.oamcontext.OamJob to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11251,42 +11758,46 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/:
+  /data/tapi-common:context/tapi-equipment:physical-context/name={value-name}/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.oamcontext.OamJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.oamcontext.OamJob"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.oamcontext.OamJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.oamcontext.OamJob.body-param"
-        description: "tapi.oam.oamcontext.OamJob to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11296,13 +11807,15 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.oamcontext.OamJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -11310,291 +11823,349 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-link-trace-job/:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLinkTraceJob"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PhysicalSpan"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthLinkTraceJob"
+          description: "tapi.equipment.PhysicalSpan"
           schema:
-            $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+            $ref: "#/definitions/tapi.equipment.PhysicalSpanWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthLinkTraceJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AbstractStrand"
+      description: "Both the serial segments that form an end-end strand and the parallel\
+        \ end-end strands."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthLinkTraceJob.body-param"
-        description: "tapi.eth.EthLinkTraceJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthLinkTraceJob"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of abstract-strand"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthLinkTraceJob.body-param"
-        description: "tapi.eth.EthLinkTraceJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.equipment.AbstractStrand"
+          schema:
+            $ref: "#/definitions/tapi.equipment.AbstractStrandWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/adjacent-strand={physical-span-uuid},{abstract-strand-local-id}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthLinkTraceJob"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AbstractStrandRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "physical-span-uuid"
+        in: "path"
+        description: "Id of adjacent-strand"
+        required: true
+        type: "string"
+      - name: "abstract-strand-local-id"
+        in: "path"
+        description: "Id of adjacent-strand"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.equipment.AbstractStrandRef"
+          schema:
+            $ref: "#/definitions/tapi.equipment.AbstractStrandRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-link-trace-job/eth-lt-msg/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOamOperationCommonPac"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.ConnectorPinAddress"
+      description: "A strand can end on two or more Pins (usually 2 pins, but a strand\
+        \ my be spliced to split a signal). This model supports only 2 ended strands.\r\
+        \n                A abstract strand may be spliced at both ends and hence\
+        \ have no direct relationship to pins or may be connected to pins at one or\
+        \ both ends.\r\n                In the essential model these Pins would be\
+        \ on connectors that plug in to connectors on Equipments.\r\n            \
+        \    The AbstractStrand is extended to the pins of the AccessPort which are\
+        \ the Pins on the Connectors of the Equipment.\r\n                In some\
+        \ cases it may not be relevant to represent the pin detail and hence the reference\
+        \ is to a connector alone."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "connector-identification"
+        in: "path"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "pin-identification"
+        in: "path"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of connector-pin"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOamOperationCommonPac"
+          description: "tapi.equipment.ConnectorPinAddress"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
+            $ref: "#/definitions/tapi.equipment.ConnectorPinAddressWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOamOperationCommonPac"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.PinAndRole"
+      description: "If there is more than one pin used in a connector and/or there\
+        \ is a need to identify the role of one or more pins then this property can\
+        \ be used.\r\n                For simple cases pinIdentification can be used\
+        \ instead."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "connector-identification"
+        in: "path"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "pin-identification"
+        in: "path"
+        description: "Id of connector-pin"
+        required: true
+        type: "string"
+      - name: "equipment-uuid"
+        in: "path"
+        description: "Id of connector-pin"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamOperationCommonPac.body-param"
-        description: "tapi.eth.EthOamOperationCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.equipment.PinAndRole"
+          schema:
+            $ref: "#/definitions/tapi.equipment.PinAndRoleWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOamOperationCommonPac"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamOperationCommonPac.body-param"
-        description: "tapi.eth.EthOamOperationCommonPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/spliced-strand={physical-span-uuid},{abstract-strand-local-id}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOamOperationCommonPac"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AbstractStrandRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "physical-span-uuid"
+        in: "path"
+        description: "Id of spliced-strand"
+        required: true
+        type: "string"
+      - name: "abstract-strand-local-id"
+        in: "path"
+        description: "Id of spliced-strand"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.equipment.AbstractStrandRef"
+          schema:
+            $ref: "#/definitions/tapi.equipment.AbstractStrandRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-loopback-job/:
-    get:
+  ? /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/abstract-strand={local-id}/strand-media-characteristics={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLoopbackJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.common.NameAndValue"
+      description: "Relevant physical properties of the abstract strand."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of abstract-strand"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of strand-media-characteristics"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthLoopbackJob"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/access-port={device-uuid},{access-port-uuid}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthLoopbackJob"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AccessPortRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthLoopbackJob.body-param"
-        description: "tapi.eth.EthLoopbackJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthLoopbackJob"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthLoopbackJob"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "device-uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of access-port"
+        required: true
+        type: "string"
+      - name: "access-port-uuid"
+        in: "path"
+        description: "Id of access-port"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthLoopbackJob.body-param"
-        description: "tapi.eth.EthLoopbackJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthLoopbackJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.equipment.AccessPortRef"
+          schema:
+            $ref: "#/definitions/tapi.equipment.AccessPortRefWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-equipment:physical-context/physical-span={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthLoopbackJob"
-      description: "none"
+      - "tapi-equipment"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of physical-span"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-loopback-job/eth-lb-msg/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOamMsgCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.eth.EthOamMsgCommonPac"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOamMsgCommonPac"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -11604,21 +12175,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -11628,80 +12194,73 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOamMsgCommonPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-1way-measurement-job/:
-    get:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1wayMeasurementJob"
+      - "tapi-notification"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemand1wayMeasurementJob"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemand1wayMeasurementJob"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.NotificationSubscriptionService"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemand1wayMeasurementJob"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -11711,13 +12270,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemand1wayMeasurementJob"
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
@@ -11725,68 +12284,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-1way-measurement-job/on-demand-control-1way-sink/:
-    get:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthOnDemandMeasurementJobControlSink"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added or\
-          \ updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -11796,13 +12370,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSink"
-      description: "none"
+      - "tapi-notification"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -11810,211 +12391,277 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-1way-measurement-job/on-demand-control-1way-source/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationChannel"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.Notification"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-2way-measurement-job/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand2wayMeasurementJob"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemand2wayMeasurementJob"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-    post:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemand2wayMeasurementJob"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemand2wayMeasurementJob"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemand2wayMeasurementJob"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.TcaInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-on-demand-2way-measurement-job/on-demand-control-2way-source/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ to list"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -12024,22 +12671,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
-          \ or updated"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
         201:
           description: "Object created"
@@ -12049,13 +12695,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
@@ -12063,66 +12709,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-1way-measurement-job/:
-    get:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthProActive1wayMeasurementJob"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive1wayMeasurementJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      - "tapi-notification"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive1wayMeasurementJob to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12132,13 +12795,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthProActive1wayMeasurementJob"
-      description: "none"
+      - "tapi-notification"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -12146,212 +12816,187 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-1way-measurement-job/pro-active-control-1way-sink/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSink"
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActiveMeasurementJobControlSink"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSink"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSink"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of additional-info"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSink"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.AlarmInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-1way-measurement-job/pro-active-control-1way-source/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.notification.TcaInfo"
+          schema:
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-2way-measurement-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthProActive2wayMeasurementJob"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - "tapi-oam"
+      summary: "returns tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.eth.EthProActive2wayMeasurementJob"
+          description: "tapi.oam.context.OamContext"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+            $ref: "#/definitions/tapi.oam.context.OamContextWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthProActive2wayMeasurementJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive2wayMeasurementJob to be added to list"
+        name: "tapi.oam.context.OamContext.body-param"
+        description: "tapi.oam.context.OamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+          $ref: "#/definitions/tapi.oam.context.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -12361,21 +13006,16 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActive2wayMeasurementJob"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
-        description: "tapi.eth.EthProActive2wayMeasurementJob to be added or updated"
+        name: "tapi.oam.context.OamContext.body-param"
+        description: "tapi.oam.context.OamContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+          $ref: "#/definitions/tapi.oam.context.OamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -12385,249 +13025,766 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthProActive2wayMeasurementJob"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
+      - "tapi-oam"
+      summary: "removes tapi.oam.context.OamContext"
+      description: "Augments the base TAPI Context with OamService information"
+      parameters: []
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-pro-active-2way-measurement-job/pro-active-control-2way-source/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
+      - "tapi-oam"
+      summary: "returns tapi.oam.oamcontext.Meg"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
+          description: "tapi.oam.oamcontext.Meg"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+            $ref: "#/definitions/tapi.oam.oamcontext.MegWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.meg.Mep"
+      description: "1. ME may have 0 MEPs (case of transit domains where at least\
+        \ 1 MIP is present)\r\n                2. ME may have 1 MEP (case of edge\
+        \ domaind, where the peer MEP is ouside the managed domain)\r\n          \
+        \      3. ME may have 2 MEPs"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.meg.Mep"
+          schema:
+            $ref: "#/definitions/tapi.oam.meg.MepWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
-        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
+      summary: "returns tapi.eth.EthMepSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.eth.EthMepSpec"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthMepSpecWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-test-job/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-common/:
     get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthTestJob"
+      summary: "returns tapi.eth.EthMepCommon"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthTestJob"
+          description: "tapi.eth.EthMepCommon"
           schema:
-            $ref: "#/definitions/tapi.eth.EthTestJob"
+            $ref: "#/definitions/tapi.eth.EthMepCommonWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-sink/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthTestJob"
+      summary: "returns tapi.eth.EthMepSink"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthTestJob.body-param"
-        description: "tapi.eth.EthTestJob to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthTestJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthMepSink"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthMepSinkWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-sink/bandwidth-report/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthTestJob"
-      description: "none"
+      summary: "returns tapi.eth.BandwidthReport"
+      description: "This attribute models the content of the bandwidth report received\
+        \ by the MEP Sink from the peer MEP Source."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthTestJob.body-param"
-        description: "tapi.eth.EthTestJob to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthTestJob"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.BandwidthReport"
+          schema:
+            $ref: "#/definitions/tapi.eth.BandwidthReportWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-eth:eth-mep-spec/eth-mep-source-pac/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthTestJob"
+      summary: "returns tapi.eth.EthMepSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.eth.EthMepSource"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthMepSourceWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/eth-test-job/eth-test-msg/:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOamMsgCommonPac"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthOamMsgCommonPac"
+          description: "tapi.odu.OduConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-common/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthOamMsgCommonPac"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.odu.OduCommonPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCommonPacWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-ctp/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCtpPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-job"
+        description: "Id of meg"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthOamMsgCommonPac.body-param"
-        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
-      responses:
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduCtpPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCtpPacWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-protection/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduProtectionPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduProtectionPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduProtectionPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPayloadType"
+      description: "This attribute is applicable when the ODU CTP object instance\
+        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
+        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
+        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
+        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
+        \ G.709 with one additional value UN_INTERPRETABLE."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduPayloadType"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduPayloadTypeWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mep={local-id}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.FecProperties"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.FecProperties"
+          schema:
+            $ref: "#/definitions/tapi.odu.FecPropertiesWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.meg.Mip"
+      description: "ME may 0, 1, or more MIPs"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.meg.Mip"
+          schema:
+            $ref: "#/definitions/tapi.oam.meg.MipWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-eth:eth-mip-spec/:
+    get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthMipSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.eth.EthMipSpec"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthMipSpecWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduMipSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduMipSpec"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduMipSpecWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-defect/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduDefectPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduDefectPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduDefectPacWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-mip/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduMipPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduMipPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduMipPacWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-mip/deg-thr/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.DegThr"
+      description: "This attribute indicates the threshold level for declaring a performance\
+        \ monitoring (PM) Second to be bad. The value of the threshold can be provisioned\
+        \ in terms of number of errored blocks or in terms of percentage of errored\
+        \ blocks. For percentage-based specification, in order to support provision\
+        \ of less than 1%, the specification consists of two fields. The first field\
+        \ indicates the granularity of percentage. For examples, in 1%, in 0.1%, or\
+        \ in 0.01%, etc. The second field indicates the multiple of the granularity.\
+        \ For number of errored block based, the value is a positive integer."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.DegThr"
+          schema:
+            $ref: "#/definitions/tapi.odu.DegThrWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-ncm/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduNcmPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduNcmPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduNcmPacWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-pm/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPmPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduPmPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduPmPacWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-pm/uas/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.UasChoice"
+      description: "UnAvailable Second"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.UasChoice"
+          schema:
+            $ref: "#/definitions/tapi.odu.UasChoiceWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/mip={local-id}/tapi-odu:odu-mip-spec/odu-tcm/:
+    get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTcmMipPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.odu.OduTcmMipPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduTcmMipPacWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/meg={uuid}/tapi-eth:eth-meg-spec/:
+    get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthMegSpec"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of meg"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.eth.EthMegSpec"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthMegSpecWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.oam.oamcontext.OamJob"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.oamcontext.OamJob.body-param"
+        description: "tapi.oam.oamcontext.OamJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.oamcontext.OamJobWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.oamcontext.OamJob"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.oamcontext.OamJob"
+          schema:
+            $ref: "#/definitions/tapi.oam.oamcontext.OamJobWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.oamcontext.OamJob"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.oam.oamcontext.OamJob.body-param"
+        description: "tapi.oam.oamcontext.OamJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.oamcontext.OamJobWrapper"
+      responses:
         201:
           description: "Object created"
         400:
@@ -12636,8 +13793,8 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthOamMsgCommonPac"
+      - "tapi-oam"
+      summary: "removes tapi.oam.oamcontext.OamJob"
       description: "none"
       parameters:
       - name: "uuid"
@@ -12650,7 +13807,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name/:
     post:
       tags:
       - "tapi-oam"
@@ -12669,7 +13826,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12677,7 +13834,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-oam"
@@ -12700,7 +13857,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -12726,7 +13883,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -12757,7 +13914,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-profile/:
     get:
       tags:
       - "tapi-oam"
@@ -12773,7 +13930,7 @@ paths:
         200:
           description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
@@ -12792,7 +13949,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -12816,7 +13973,7 @@ paths:
         description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -12840,7 +13997,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
@@ -12857,7 +14014,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -12865,8 +14022,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/oam-service-end-point={oam-service-uuid},{oam-service-end-point-local-id}/
+  : get:
       tags:
       - "tapi-oam"
       summary: "returns tapi.oam.OamServiceEndPointRef"
@@ -12891,7 +14048,7 @@ paths:
         200:
           description: "tapi.oam.OamServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     put:
@@ -12920,7 +14077,7 @@ paths:
         description: "tapi.oam.OamServiceEndPointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -12954,7 +14111,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/:
     get:
       tags:
       - "tapi-oam"
@@ -12979,10 +14136,10 @@ paths:
         200:
           description: "tapi.oam.oamjob.PmCurrentData"
           schema:
-            $ref: "#/definitions/tapi.oam.oamjob.PmCurrentData"
+            $ref: "#/definitions/tapi.oam.oamjob.PmCurrentDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/:
     get:
       tags:
       - "tapi-oam"
@@ -13003,10 +14160,10 @@ paths:
         200:
           description: "tapi.common.TimeInterval"
           schema:
-            $ref: "#/definitions/tapi.common.TimeInterval"
+            $ref: "#/definitions/tapi.common.TimeIntervalWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/elapsed-time/period={unit}/:
     get:
       tags:
       - "tapi-oam"
@@ -13032,14 +14189,14 @@ paths:
         200:
           description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-link-trace-result-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLinkTraceResultData"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13054,20 +14211,19 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthLinkTraceResultData"
+          description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-link-trace-result-data/result-list={source-address}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.LinkTraceResult"
-      description: "G.8052: This parameter returns the results of the LT process.\
-        \ It contains a list of the result received from the individual LTR frames.\r\
-        \n                The result from the individual LTR frame include the Source\
-        \ Mac Address, the TTL, and TLV."
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13079,24 +14235,27 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "source-address"
+      - name: "value-name"
         in: "path"
-        description: "Id of result-list"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.LinkTraceResult"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.eth.LinkTraceResult"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-loopback-result-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLoopbackResultData"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.oam.pmcurrentdata.PmHistoryData"
+      description: "in case of 24hr Current Data, at least 1 History Data.\r\n   \
+        \             In case of 15min Current Data, at least 16 History Data.\r\n\
+        \                In case of <15min, the number of History Data shall be able\
+        \ to cover a span of 4 hours."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13108,19 +14267,24 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthLoopbackResultData"
+          description: "tapi.oam.pmcurrentdata.PmHistoryData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
+            $ref: "#/definitions/tapi.oam.pmcurrentdata.PmHistoryDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-dm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
+  : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthOnDemand1DmPerformanceData"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13132,14 +14296,84 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.TimePeriod"
+          schema:
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/
+  : get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOnDemand1DmPerformanceData"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-current-data"
+        required: true
+        type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemand1DmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13157,15 +14391,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-lm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthOnDemand1LmPerformanceData"
@@ -13181,14 +14420,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemand1LmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13206,15 +14450,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-dm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthOnDemandDmPerformanceData"
@@ -13230,14 +14479,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemandDmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13255,14 +14509,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13280,15 +14539,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-lm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthOnDemandLmPerformanceData"
@@ -13304,14 +14568,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemandLmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13329,14 +14598,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13354,15 +14628,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-dm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthProActive1DmPerformanceData"
@@ -13378,14 +14657,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActive1DmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13402,15 +14686,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-lm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthProActive1LmPerformanceData"
@@ -13426,14 +14715,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActive1LmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13450,15 +14744,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthProActiveDmPerformanceData"
@@ -13474,14 +14773,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActiveDmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13499,14 +14803,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13523,14 +14832,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13547,15 +14861,20 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-lm-performance-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-lm-performance-data/
+  : get:
       tags:
       - "tapi-eth"
       summary: "returns tapi.eth.EthProActiveLmPerformanceData"
@@ -13571,14 +14890,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActiveLmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13595,14 +14919,19 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
+      - name: "pm-history-data-local-id"
+        in: "path"
+        description: "Id of pm-history-data"
+        required: true
+        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13619,42 +14948,23 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
-        400:
-          description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/eth-test-result-data/:
-    get:
-      tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthTestResultData"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
+      - name: "pm-history-data-local-id"
         in: "path"
-        description: "Id of pm-current-data"
+        description: "Id of pm-history-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthTestResultData"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.EthTestResultData"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-link-trace-result-data/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthLinkTraceResultData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -13669,19 +14979,20 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimePeriod"
+          description: "tapi.eth.EthLinkTraceResultData"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.eth.EthLinkTraceResultDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-link-trace-result-data/result-list={source-address}/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.LinkTraceResult"
+      description: "G.8052: This parameter returns the results of the LT process.\
+        \ It contains a list of the result received from the individual LTR frames.\r\
+        \n                The result from the individual LTR frame include the Source\
+        \ Mac Address, the TTL, and TLV."
       parameters:
       - name: "uuid"
         in: "path"
@@ -13693,27 +15004,24 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "source-address"
         in: "path"
-        description: "Id of name"
+        description: "Id of result-list"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.eth.LinkTraceResult"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.eth.LinkTraceResultWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-loopback-result-data/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.pmcurrentdata.PmHistoryData"
-      description: "in case of 24hr Current Data, at least 1 History Data.\r\n   \
-        \             In case of 15min Current Data, at least 16 History Data.\r\n\
-        \                In case of <15min, the number of History Data shall be able\
-        \ to cover a span of 4 hours."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthLoopbackResultData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -13725,19 +15033,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.oam.pmcurrentdata.PmHistoryData"
+          description: "tapi.eth.EthLoopbackResultData"
           schema:
-            $ref: "#/definitions/tapi.oam.pmcurrentdata.PmHistoryData"
+            $ref: "#/definitions/tapi.eth.EthLoopbackResultDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-dm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -13754,19 +15057,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemand1DmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-dm-performance-data/on-demand-near-end-1-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13784,19 +15082,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-lm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -13813,19 +15106,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemand1LmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-1-lm-performance-data/on-demand-near-end-1-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13843,19 +15131,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-dm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-dm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -13872,19 +15155,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemandDmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-far-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13902,19 +15180,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-dm-performance-data/on-demand-near-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13932,19 +15205,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-lm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-lm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -13961,19 +15229,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthOnDemandLmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-far-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -13991,19 +15254,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-on-demand-lm-performance-data/on-demand-near-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14021,19 +15279,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.OnDemandLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-dm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -14050,19 +15303,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActive1DmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-dm-performance-data/pro-active-near-end-1-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14079,19 +15327,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-lm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -14108,19 +15351,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActive1LmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-1-lm-performance-data/pro-active-near-end-1-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14137,19 +15375,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -14166,19 +15399,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActiveDmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-bi-dir-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14196,19 +15424,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-far-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14225,19 +15448,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-dm-performance-data/pro-active-near-end-dm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14254,19 +15472,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-lm-performance-data/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-lm-performance-data/
   : get:
       tags:
       - "tapi-eth"
@@ -14283,19 +15496,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.EthProActiveLmPerformanceData"
           schema:
-            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+            $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceDataWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-far-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14312,19 +15520,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-pro-active-lm-performance-data/pro-active-near-end-lm-parameters/
   : get:
       tags:
       - "tapi-eth"
@@ -14341,23 +15544,18 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
       responses:
         200:
           description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/granularity-period/
-  : get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/pm-current-data={local-id}/tapi-eth:eth-test-result-data/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthTestResultData"
       description: "none"
       parameters:
       - name: "uuid"
@@ -14370,55 +15568,14 @@ paths:
         description: "Id of pm-current-data"
         required: true
         type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.TimePeriod"
-          schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
-        400:
-          description: "Internal error"
-  ? /data/context/oam-context/oam-job={uuid}/pm-current-data={local-id}/pm-history-data={pm-history-data-local-id}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-job"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-current-data"
-        required: true
-        type: "string"
-      - name: "pm-history-data-local-id"
-        in: "path"
-        description: "Id of pm-history-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.eth.EthTestResultData"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.eth.EthTestResultDataWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-job={uuid}/schedule/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/schedule/:
     get:
       tags:
       - "tapi-oam"
@@ -14434,7 +15591,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -14453,7 +15610,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -14477,7 +15634,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -14501,62 +15658,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile/:
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-link-trace-job/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.oamcontext.OamProfile"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.oam.oamcontext.OamProfile.body-param"
-        description: "tapi.oam.oamcontext.OamProfile to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthLinkTraceJob"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthLinkTraceJobWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.oamcontext.OamProfile"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.eth.EthLinkTraceJob.body-param"
+        description: "tapi.eth.EthLinkTraceJob to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthLinkTraceJobWrapper"
       responses:
-        200:
-          description: "tapi.oam.oamcontext.OamProfile"
-          schema:
-            $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.oamcontext.OamProfile"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.oamcontext.OamProfile.body-param"
-        description: "tapi.oam.oamcontext.OamProfile to be added or updated"
+        name: "tapi.eth.EthLinkTraceJob.body-param"
+        description: "tapi.eth.EthLinkTraceJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
+          $ref: "#/definitions/tapi.eth.EthLinkTraceJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -14566,13 +15727,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.oamcontext.OamProfile"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthLinkTraceJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -14580,83 +15741,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/name/:
-    post:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-link-trace-job/eth-lt-msg/:
+    get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOamOperationCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOamOperationCommonPac"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOamOperationCommonPacWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOamOperationCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOamOperationCommonPac.body-param"
+        description: "tapi.eth.EthOamOperationCommonPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPacWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOamOperationCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.eth.EthOamOperationCommonPac.body-param"
+        description: "tapi.eth.EthOamOperationCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.EthOamOperationCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -14666,45 +15810,56 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOamOperationCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "value-name"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-loopback-job/:
+    get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthLoopbackJob"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.eth.EthLoopbackJob"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthLoopbackJobWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.PmBinData"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthLoopbackJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.PmBinData.body-param"
-        description: "tapi.oam.PmBinData to be added to list"
+        name: "tapi.eth.EthLoopbackJob.body-param"
+        description: "tapi.eth.EthLoopbackJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.eth.EthLoopbackJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -14712,52 +15867,106 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
-    get:
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.PmBinData"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthLoopbackJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.eth.EthLoopbackJob.body-param"
+        description: "tapi.eth.EthLoopbackJob to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthLoopbackJobWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthLoopbackJob"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-loopback-job/eth-lb-msg/:
+    get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOamMsgCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.PmBinData"
+          description: "tapi.eth.EthOamMsgCommonPac"
           schema:
-            $ref: "#/definitions/tapi.oam.PmBinData"
+            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
         400:
           description: "Internal error"
-    put:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.PmBinData"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      - in: "body"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.PmBinData.body-param"
-        description: "tapi.oam.PmBinData to be added or updated"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.PmBinData"
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -14767,18 +15976,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.PmBinData"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOamMsgCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -14786,52 +15990,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-1way-measurement-job/:
     get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOnDemand1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimePeriod"
+          description: "tapi.eth.EthOnDemand1wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJobWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOnDemand1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added to list"
+        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -14841,26 +16035,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOnDemand1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added or updated"
+        name: "tapi.eth.EthOnDemand1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand1wayMeasurementJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -14870,18 +16059,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimePeriod"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOnDemand1wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -14889,31 +16073,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-1way-measurement-job/on-demand-control-1way-sink/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.eth.EthOnDemandMeasurementJobControlSink"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper"
+        400:
+          description: "Internal error"
+    post:
+      tags:
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-bin-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper"
       responses:
         201:
           description: "Object created"
@@ -14921,66 +16117,24 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
-    get:
+    put:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSink to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper"
       responses:
         201:
           description: "Object created"
@@ -14990,25 +16144,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSink"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-bin-data"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15016,77 +16158,68 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data/:
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-1way-measurement-job/on-demand-control-1way-source/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.oamprofile.PmThresholdData"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
+        description: "Id of oam-job"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.oamprofile.PmThresholdData.body-param"
-        description: "tapi.oam.oamprofile.PmThresholdData to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
+          schema:
+            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.oamprofile.PmThresholdData"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
-        200:
-          description: "tapi.oam.oamprofile.PmThresholdData"
-          schema:
-            $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.oamprofile.PmThresholdData"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.oamprofile.PmThresholdData.body-param"
-        description: "tapi.oam.oamprofile.PmThresholdData to be added or updated"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15096,18 +16229,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.oamprofile.PmThresholdData"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15115,52 +16243,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-dm-threshold-data/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-2way-measurement-job/:
     get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.Eth1DmThresholdData"
+      summary: "returns tapi.eth.EthOnDemand2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.Eth1DmThresholdData"
+          description: "tapi.eth.EthOnDemand2wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+            $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJobWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.Eth1DmThresholdData"
+      summary: "creates tapi.eth.EthOnDemand2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.Eth1DmThresholdData.body-param"
-        description: "tapi.eth.Eth1DmThresholdData to be added to list"
+        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15171,25 +16289,20 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.Eth1DmThresholdData"
+      summary: "creates or updates tapi.eth.EthOnDemand2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.Eth1DmThresholdData.body-param"
-        description: "tapi.eth.Eth1DmThresholdData to be added or updated"
+        name: "tapi.eth.EthOnDemand2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthOnDemand2wayMeasurementJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15200,17 +16313,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.Eth1DmThresholdData"
+      summary: "removes tapi.eth.EthOnDemand2wayMeasurementJob"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15218,54 +16326,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-dm-threshold-data/near-end-1-dm-clear-threshold/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-on-demand-2way-measurement-job/on-demand-control-2way-source/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      summary: "returns tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthOnDemandMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      summary: "creates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15276,26 +16373,21 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      summary: "creates or updates tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.eth.EthOnDemandMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthOnDemandMeasurementJobControlSource to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15306,18 +16398,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      summary: "removes tapi.eth.EthOnDemandMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15325,54 +16411,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-dm-threshold-data/near-end-1-dm-cross-threshold/
-  : get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-1way-measurement-job/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      summary: "returns tapi.eth.EthProActive1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthProActive1wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJobWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      summary: "creates tapi.eth.EthProActive1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive1wayMeasurementJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15383,26 +16457,20 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      summary: "creates or updates tapi.eth.EthProActive1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.eth.EthProActive1wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive1wayMeasurementJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15413,18 +16481,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      summary: "removes tapi.eth.EthProActive1wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15432,52 +16494,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-lm-threshold-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-1way-measurement-job/pro-active-control-1way-sink/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.Eth1LmThresholdData"
+      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSink"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.Eth1LmThresholdData"
+          description: "tapi.eth.EthProActiveMeasurementJobControlSink"
           schema:
-            $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSinkWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.Eth1LmThresholdData"
+      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSink"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.Eth1LmThresholdData.body-param"
-        description: "tapi.eth.Eth1LmThresholdData to be added to list"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSinkWrapper"
       responses:
         201:
           description: "Object created"
@@ -15488,25 +16541,21 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.Eth1LmThresholdData"
+      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSink"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.Eth1LmThresholdData.body-param"
-        description: "tapi.eth.Eth1LmThresholdData to be added or updated"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSink.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSink to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSinkWrapper"
       responses:
         201:
           description: "Object created"
@@ -15517,17 +16566,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.Eth1LmThresholdData"
+      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSink"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15535,58 +16579,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-lm-threshold-data/near-end-1-lm-clear-threshold/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-1way-measurement-job/pro-active-control-1way-source/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15597,28 +16626,21 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15629,20 +16651,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15650,54 +16664,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-1-lm-threshold-data/near-end-1-lm-cross-threshold/
-  : get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-2way-measurement-job/:
+    get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "returns tapi.eth.EthProActive2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          description: "tapi.eth.EthProActive2wayMeasurementJob"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJobWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "creates tapi.eth.EthProActive2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
+        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive2wayMeasurementJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15708,26 +16710,20 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "creates or updates tapi.eth.EthProActive2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
+        name: "tapi.eth.EthProActive2wayMeasurementJob.body-param"
+        description: "tapi.eth.EthProActive2wayMeasurementJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15738,18 +16734,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "removes tapi.eth.EthProActive2wayMeasurementJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15757,52 +16747,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-pro-active-2way-measurement-job/pro-active-control-2way-source/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthDmThresholdData"
+      summary: "returns tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthDmThresholdData"
+          description: "tapi.eth.EthProActiveMeasurementJobControlSource"
           schema:
-            $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+            $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.EthDmThresholdData"
+      summary: "creates tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthDmThresholdData.body-param"
-        description: "tapi.eth.EthDmThresholdData to be added to list"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15813,25 +16794,21 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthDmThresholdData"
+      summary: "creates or updates tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthDmThresholdData.body-param"
-        description: "tapi.eth.EthDmThresholdData to be added or updated"
+        name: "tapi.eth.EthProActiveMeasurementJobControlSource.body-param"
+        description: "tapi.eth.EthProActiveMeasurementJobControlSource to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+          $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSourceWrapper"
       responses:
         201:
           description: "Object created"
@@ -15842,17 +16819,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.EthDmThresholdData"
+      summary: "removes tapi.eth.EthProActiveMeasurementJobControlSource"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15860,54 +16832,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/bi-dir-dm-clear-threshold/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-test-job/:
     get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional clear threshold values\
-        \ of the delay measurements."
+      summary: "returns tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthTestJob"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthTestJobWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional clear threshold values\
-        \ of the delay measurements."
+      summary: "creates tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        name: "tapi.eth.EthTestJob.body-param"
+        description: "tapi.eth.EthTestJob to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthTestJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15918,26 +16878,20 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional clear threshold values\
-        \ of the delay measurements."
+      summary: "creates or updates tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.eth.EthTestJob.body-param"
+        description: "tapi.eth.EthTestJob to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthTestJobWrapper"
       responses:
         201:
           description: "Object created"
@@ -15948,18 +16902,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional clear threshold values\
-        \ of the delay measurements."
+      summary: "removes tapi.eth.EthTestJob"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -15967,54 +16915,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/bi-dir-dm-cross-threshold/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-job={uuid}/tapi-eth:eth-test-job/eth-test-msg/:
     get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional cross threshold values\
-        \ of the delay measurements."
+      summary: "returns tapi.eth.EthOamMsgCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.eth.EthOamMsgCommonPac"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional cross threshold values\
-        \ of the delay measurements."
+      summary: "creates tapi.eth.EthOamMsgCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -16025,26 +16961,20 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional cross threshold values\
-        \ of the delay measurements."
+      summary: "creates or updates tapi.eth.EthOamMsgCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.eth.EthOamMsgCommonPac.body-param"
+        description: "tapi.eth.EthOamMsgCommonPac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.EthOamMsgCommonPacWrapper"
       responses:
         201:
           description: "Object created"
@@ -16055,18 +16985,12 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the bidirectional cross threshold values\
-        \ of the delay measurements."
+      summary: "removes tapi.eth.EthOamMsgCommonPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-job"
         required: true
         type: "string"
       responses:
@@ -16074,54 +16998,19 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/far-end-dm-clear-threshold/:
-    get:
-      tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end clear threshold values of\
-        \ the delay measurements."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile/:
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates tapi.oam.oamcontext.OamProfile"
+      description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-profile"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        name: "tapi.oam.oamcontext.OamProfile.body-param"
+        description: "tapi.oam.oamcontext.OamProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.oam.oamcontext.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -16129,29 +17018,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-    put:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "returns tapi.oam.oamcontext.OamProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      responses:
+        200:
+          description: "tapi.oam.oamcontext.OamProfile"
+          schema:
+            $ref: "#/definitions/tapi.oam.oamcontext.OamProfileWrapper"
+        400:
+          description: "Internal error"
+    put:
+      tags:
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.oamcontext.OamProfile"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.oam.oamcontext.OamProfile.body-param"
+        description: "tapi.oam.oamcontext.OamProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.oam.oamcontext.OamProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -16161,104 +17063,97 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "removes tapi.oam.oamcontext.OamProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/far-end-dm-cross-threshold/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16268,19 +17163,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
+      - name: "value-name"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -16288,37 +17184,37 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/near-end-dm-clear-threshold/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates tapi.oam.PmBinData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.oam.PmBinData.body-param"
+        description: "tapi.oam.PmBinData to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "returns tapi.oam.PmBinData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16327,28 +17223,21 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.PmBinData"
+          schema:
+            $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.PmBinData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16357,15 +17246,15 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.oam.PmBinData.body-param"
+        description: "tapi.oam.PmBinData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.oam.PmBinDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -16375,10 +17264,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end clear threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "removes tapi.oam.PmBinData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16387,7 +17275,7 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       responses:
@@ -16395,13 +17283,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-dm-threshold-data/near-end-dm-cross-threshold/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/granularity-period/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16410,22 +17297,21 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16434,15 +17320,15 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -16452,10 +17338,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16464,15 +17349,15 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -16482,10 +17367,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the delay measurements."
+      - "tapi-oam"
+      summary: "removes tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16494,7 +17378,7 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
       responses:
@@ -16502,12 +17386,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthLmThresholdData"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16516,21 +17402,30 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.eth.EthLmThresholdData"
-          schema:
-            $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-bin-data={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.EthLmThresholdData"
-      description: "none"
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16539,27 +17434,28 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.EthLmThresholdData.body-param"
-        description: "tapi.eth.EthLmThresholdData to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.EthLmThresholdData"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.EthLmThresholdData"
-      description: "none"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16568,15 +17464,20 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.EthLmThresholdData.body-param"
-        description: "tapi.eth.EthLmThresholdData to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.EthLmThresholdData"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16586,9 +17487,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.EthLmThresholdData"
-      description: "none"
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16597,7 +17500,12 @@ paths:
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of pm-threshold-data"
+        description: "Id of pm-bin-data"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -16605,41 +17513,37 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/far-end-lm-clear-threshold/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "creates tapi.oam.oamprofile.PmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of pm-threshold-data"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.oam.oamprofile.PmThresholdData.body-param"
+        description: "tapi.oam.oamprofile.PmThresholdData to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdDataWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "returns tapi.oam.oamprofile.PmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16651,27 +17555,18 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.oam.oamprofile.PmThresholdData"
+          schema:
+            $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdDataWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.oamprofile.PmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16684,11 +17579,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
+        name: "tapi.oam.oamprofile.PmThresholdData.body-param"
+        description: "tapi.oam.oamprofile.PmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -16698,12 +17593,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "removes tapi.oam.oamprofile.PmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16720,13 +17612,12 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/far-end-lm-cross-threshold/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
     get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the loss measurements."
+      - "tapi-oam"
+      summary: "returns tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16740,17 +17631,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          description: "tapi.common.TimePeriod"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.common.TimePeriodWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the loss measurements."
+      - "tapi-oam"
+      summary: "creates tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16763,11 +17653,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -16777,10 +17667,9 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the loss measurements."
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16793,11 +17682,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
+        name: "tapi.common.TimePeriod.body-param"
+        description: "tapi.common.TimePeriod to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.common.TimePeriodWrapper"
       responses:
         201:
           description: "Object created"
@@ -16807,10 +17696,9 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the far end cross threshold values of\
-        \ the loss measurements."
+      - "tapi-oam"
+      summary: "removes tapi.common.TimePeriod"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16827,15 +17715,14 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/near-end-lm-clear-threshold/:
-    get:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
+    post:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16847,21 +17734,27 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
-          schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
+    get:
       tags:
-      - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16873,27 +17766,25 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16905,12 +17796,17 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -16920,12 +17816,11 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute is only valid for frame loss ratio parameters and\
-        \ counter type parameters working in the 'standing condition method' (see\
-        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
-        \ clear threshold values of the loss measurements."
+      - "tapi-oam"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -16937,18 +17832,22 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/eth-lm-threshold-data/near-end-lm-cross-threshold/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-dm-threshold-data/
+  : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "returns tapi.eth.Eth1DmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16962,17 +17861,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.StatisticalLmPerformanceParameters"
+          description: "tapi.eth.Eth1DmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+            $ref: "#/definitions/tapi.eth.Eth1DmThresholdDataWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-eth"
-      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "creates tapi.eth.Eth1DmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -16985,11 +17883,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
+        name: "tapi.eth.Eth1DmThresholdData.body-param"
+        description: "tapi.eth.Eth1DmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.Eth1DmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -17000,9 +17898,8 @@ paths:
     put:
       tags:
       - "tapi-eth"
-      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "creates or updates tapi.eth.Eth1DmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -17015,11 +17912,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
-        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
+        name: "tapi.eth.Eth1DmThresholdData.body-param"
+        description: "tapi.eth.Eth1DmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+          $ref: "#/definitions/tapi.eth.Eth1DmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -17030,9 +17927,8 @@ paths:
     delete:
       tags:
       - "tapi-eth"
-      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
-      description: "This attribute contains the near end cross threshold values of\
-        \ the loss measurements."
+      summary: "removes tapi.eth.Eth1DmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -17049,12 +17945,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/granularity-period/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-dm-threshold-data/near-end-1-dm-clear-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.TimePeriod"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17068,16 +17965,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.TimePeriod"
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.TimePeriod"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.TimePeriod"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17090,11 +17988,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added to list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17104,9 +18002,10 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.TimePeriod"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17119,11 +18018,11 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.TimePeriod.body-param"
-        description: "tapi.common.TimePeriod to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimePeriod"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17133,9 +18032,10 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.TimePeriod"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17152,14 +18052,13 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-dm-threshold-data/near-end-1-dm-cross-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17171,27 +18070,19 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/name={value-name}/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17203,25 +18094,25 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
+        409:
+          description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17233,17 +18124,12 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17253,11 +18139,10 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
@@ -17269,113 +18154,57 @@ paths:
         description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service/:
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamService"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.OamService.body-param"
-        description: "tapi.oam.OamService to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamService"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-lm-threshold-data/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamService"
+      - "tapi-eth"
+      summary: "returns tapi.eth.Eth1LmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.oam.OamService"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamService"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamService"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.oam.OamService.body-param"
-        description: "tapi.oam.OamService to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.oam.OamService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.eth.Eth1LmThresholdData"
+          schema:
+            $ref: "#/definitions/tapi.eth.Eth1LmThresholdDataWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamService"
+      - "tapi-eth"
+      summary: "creates tapi.eth.Eth1LmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point/:
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamServiceEndPoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamServiceEndPoint.body-param"
-        description: "tapi.oam.OamServiceEndPoint to be added to list"
+        name: "tapi.eth.Eth1LmThresholdData.body-param"
+        description: "tapi.eth.Eth1LmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.eth.Eth1LmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -17383,52 +18212,28 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamServiceEndPoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.oam.OamServiceEndPoint"
-          schema:
-            $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamServiceEndPoint"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.Eth1LmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamServiceEndPoint.body-param"
-        description: "tapi.oam.OamServiceEndPoint to be added or updated"
+        name: "tapi.eth.Eth1LmThresholdData.body-param"
+        description: "tapi.eth.Eth1LmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
+          $ref: "#/definitions/tapi.eth.Eth1LmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -17438,18 +18243,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamServiceEndPoint"
+      - "tapi-eth"
+      summary: "removes tapi.eth.Eth1LmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -17457,53 +18262,58 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-lm-threshold-data/near-end-1-lm-clear-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ to list"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17513,27 +18323,29 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
-        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
-          \ or updated"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17543,18 +18355,21 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -17562,146 +18377,188 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mep/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-1-lm-threshold-data/near-end-1-lm-cross-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/mip/:
-    get:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
-        200:
-          description: "tapi.oam.MipRef"
-          schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name/:
-    post:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - name: "value-name"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/:
+    get:
+      tags:
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthDmThresholdData"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.eth.EthDmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.eth.EthDmThresholdDataWrapper"
         400:
           description: "Internal error"
-    put:
+    post:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthDmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - name: "value-name"
+      - in: "body"
+        name: "tapi.eth.EthDmThresholdData.body-param"
+        description: "tapi.eth.EthDmThresholdData to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.eth.EthDmThresholdDataWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthDmThresholdData"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.eth.EthDmThresholdData.body-param"
+        description: "tapi.eth.EthDmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.EthDmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -17711,25 +18568,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthDmThresholdData"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -17737,52 +18587,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/bi-dir-dm-clear-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional clear threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional clear threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17792,26 +18644,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional clear threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17821,18 +18674,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional clear threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -17840,45 +18694,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/meg/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/bi-dir-dm-cross-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MegRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional cross threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MegRef"
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.oam.MegRef"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-  /data/context/oam-context/oam-service={uuid}/name/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional cross threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17886,56 +18749,29 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/oam-context/oam-service={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-oam"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of oam-service"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional cross threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -17945,20 +18781,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the bidirectional cross threshold values\
+        \ of the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -17966,42 +18801,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/oam-context/oam-service={uuid}/oam-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/far-end-dm-clear-threshold/
+  : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.OamProfileRef"
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.oam.OamProfileRef"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-oam"
-      summary: "creates tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added to list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18011,21 +18858,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-oam"
-      summary: "creates or updates tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.oam.OamProfileRef.body-param"
-        description: "tapi.oam.OamProfileRef to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.oam.OamProfileRef"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18035,13 +18888,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-oam"
-      summary: "removes tapi.oam.OamProfileRef"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of oam-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18049,33 +18908,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/far-end-dm-cross-threshold/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the delay measurements."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathComputationContext"
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the delay measurements."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added to\
-          \ list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18085,17 +18965,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the delay measurements."
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathComputationContext.body-param"
-        description: "tapi.path.computation.PathComputationContext to be added or\
-          \ updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationContext"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18105,114 +18995,74 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationContext"
-      description: "Augments the base TAPI Context with PathComputationService information"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathComputationService"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added to\
-          \ list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathComputationService"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathComputationService"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathComputationService"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathComputationService"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.PathComputationService.body-param"
-        description: "tapi.path.computation.PathComputationService to be added or\
-          \ updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.PathComputationService"
       responses:
-        201:
-          description: "Object created"
         400:
           description: "Internal error"
         204:
-          description: "Object modified"
-    delete:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/near-end-dm-clear-threshold/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathComputationService"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
+          schema:
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathServiceEndPoint"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18220,52 +19070,29 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathServiceEndPoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathServiceEndPoint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
-        400:
-          description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathServiceEndPoint.body-param"
-        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18275,18 +19102,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathServiceEndPoint"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end clear threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18294,52 +19122,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-dm-threshold-data/near-end-dm-cross-threshold/
+  : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.Capacity"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.eth.StatisticalDmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.Capacity"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added to list"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18349,26 +19179,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.Capacity"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.Capacity.body-param"
-        description: "tapi.common.Capacity to be added or updated"
+        name: "tapi.eth.StatisticalDmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalDmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18378,18 +19209,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.Capacity"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalDmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the delay measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18397,52 +19229,52 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthLmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.eth.EthLmThresholdData"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.eth.EthLmThresholdDataWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.BandwidthProfile"
+      - "tapi-eth"
+      summary: "creates tapi.eth.EthLmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added to list"
+        name: "tapi.eth.EthLmThresholdData.body-param"
+        description: "tapi.eth.EthLmThresholdData to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.eth.EthLmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -18452,26 +19284,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.BandwidthProfile"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.EthLmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.BandwidthProfile.body-param"
-        description: "tapi.common.BandwidthProfile to be added or updated"
+        name: "tapi.eth.EthLmThresholdData.body-param"
+        description: "tapi.eth.EthLmThresholdData to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.eth.EthLmThresholdDataWrapper"
       responses:
         201:
           description: "Object created"
@@ -18481,18 +19313,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.BandwidthProfile"
+      - "tapi-eth"
+      summary: "removes tapi.eth.EthLmThresholdData"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18500,52 +19332,58 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/far-end-lm-clear-threshold/
   : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18555,26 +19393,29 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18584,18 +19425,21 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the far end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18603,52 +19447,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/far-end-lm-cross-threshold/
   : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18658,26 +19504,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18687,18 +19534,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the far end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18706,52 +19554,58 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/near-end-lm-clear-threshold/
   : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18761,26 +19615,29 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18790,18 +19647,21 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute is only valid for frame loss ratio parameters and\
+        \ counter type parameters working in the 'standing condition method' (see\
+        \ G.7710, section 10.1.7.2: Threshold reporting) and contains the near end\
+        \ clear threshold values of the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18809,52 +19669,54 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-oam:oam-context/oam-profile={uuid}/pm-threshold-data={local-id}/tapi-eth:eth-lm-threshold-data/near-end-lm-cross-threshold/
   : get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.eth.StatisticalLmPerformanceParameters"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18864,26 +19726,27 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "creates or updates tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.eth.StatisticalLmPerformanceParameters.body-param"
+        description: "tapi.eth.StatisticalLmPerformanceParameters to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParametersWrapper"
       responses:
         201:
           description: "Object created"
@@ -18893,18 +19756,19 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-eth"
+      summary: "removes tapi.eth.StatisticalLmPerformanceParameters"
+      description: "This attribute contains the near end cross threshold values of\
+        \ the loss measurements."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-profile"
         required: true
         type: "string"
       - name: "local-id"
         in: "path"
-        description: "Id of end-point"
+        description: "Id of pm-threshold-data"
         required: true
         type: "string"
       responses:
@@ -18912,84 +19776,62 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service/:
+    post:
+      tags:
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamService"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.OamService.body-param"
+        description: "tapi.oam.OamService to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.oam.OamService"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
-      responses:
-        201:
-          description: "Object created"
+            $ref: "#/definitions/tapi.oam.OamServiceWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.CapacityValue.body-param"
-        description: "tapi.common.CapacityValue to be added or updated"
+        name: "tapi.oam.OamService.body-param"
+        description: "tapi.oam.OamService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.oam.OamServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -18999,19 +19841,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service"
         required: true
         type: "string"
       responses:
@@ -19019,31 +19855,24 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of end-point"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.oam.OamServiceEndPoint.body-param"
+        description: "tapi.oam.OamServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -19051,18 +19880,16 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19070,29 +19897,22 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.oam.OamServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19100,17 +19920,12 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.oam.OamServiceEndPoint.body-param"
+        description: "tapi.oam.OamServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.oam.OamServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -19120,15 +19935,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19136,26 +19949,21 @@ paths:
         description: "Id of end-point"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/connectivity-service-end-point/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "returns tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19165,20 +19973,20 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.connectivity.ConnectivityServiceEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "creates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19187,11 +19995,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added to list"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -19201,13 +20010,13 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "creates or updates tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19216,11 +20025,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.ServiceInterfacePointRef.body-param"
-        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
+        name: "tapi.connectivity.ConnectivityServiceEndPointRef.body-param"
+        description: "tapi.connectivity.ConnectivityServiceEndPointRef to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+          $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -19230,13 +20040,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.common.ServiceInterfacePointRef"
+      - "tapi-oam"
+      summary: "removes tapi.connectivity.ConnectivityServiceEndPointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "local-id"
@@ -19249,10 +20059,58 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mep/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.MepRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/mip/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.MipRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19260,7 +20118,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
@@ -19268,7 +20131,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -19276,10 +20139,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19287,7 +20150,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -19299,12 +20167,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19312,7 +20180,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -19325,7 +20198,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -19335,7 +20208,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19343,7 +20216,12 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -19356,42 +20234,52 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/end-point={local-id}/service-interface-point/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathObjectiveFunction"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -19401,21 +20289,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathObjectiveFunction.body-param"
-        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -19425,13 +20318,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      - "tapi-oam"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -19439,10 +20337,29 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/meg/:
+    get:
+      tags:
+      - "tapi-oam"
+      summary: "returns tapi.oam.MegRef"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of oam-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.oam.MegRef"
+          schema:
+            $ref: "#/definitions/tapi.oam.MegRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name/:
     post:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19450,7 +20367,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
@@ -19458,7 +20375,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -19466,10 +20383,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19477,7 +20394,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "value-name"
@@ -19489,12 +20406,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19502,7 +20419,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "value-name"
@@ -19515,7 +20432,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -19525,7 +20442,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
+      - "tapi-oam"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -19533,7 +20450,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - name: "value-name"
@@ -19546,43 +20463,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+  /data/tapi-common:context/tapi-oam:oam-context/oam-service={uuid}/oam-profile/:
     get:
       tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "returns tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.PathOptimizationConstraint"
+          description: "tapi.oam.OamProfileRef"
           schema:
-            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+            $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "creates tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ to list"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -19592,22 +20508,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "creates or updates tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
-        description: "tapi.path.computation.PathOptimizationConstraint to be added\
-          \ or updated"
+        name: "tapi.oam.OamProfileRef.body-param"
+        description: "tapi.oam.OamProfileRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
+          $ref: "#/definitions/tapi.oam.OamProfileRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -19617,13 +20532,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      - "tapi-oam"
+      summary: "removes tapi.oam.OamProfileRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of oam-service"
         required: true
         type: "string"
       responses:
@@ -19631,26 +20546,85 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
+      responses:
+        200:
+          description: "tapi.path.computation.PathComputationContext"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
+        400:
+          description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added to\
+          \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        409:
+          description: "Object already exists"
+    put:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.PathComputationContext.body-param"
+        description: "tapi.path.computation.PathComputationContext to be added or\
+          \ updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathComputationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.PathComputationContext"
+      description: "Augments the base TAPI Context with PathComputationService information"
+      parameters: []
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service/:
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathComputationService"
+      description: "none"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added to\
+          \ list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -19658,56 +20632,43 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.path.computation.PathComputationService"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "creates or updates tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
+        name: "tapi.path.computation.PathComputationService.body-param"
+        description: "tapi.path.computation.PathComputationService to be added or\
+          \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.path.computation.PathComputationServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -19718,152 +20679,37 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "removes tapi.path.computation.PathComputationService"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.PathRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "path-uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.PathRef"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.PathRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.RoutingConstraint.body-param"
-        description: "tapi.path.computation.RoutingConstraint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.RoutingConstraint"
+      summary: "creates tapi.path.computation.PathServiceEndPoint"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added to list"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -19871,54 +20717,52 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "returns tapi.path.computation.PathServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.CostCharacteristic"
+          description: "tapi.path.computation.PathServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "creates or updates tapi.path.computation.PathServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.CostCharacteristic.body-param"
-        description: "tapi.topology.CostCharacteristic to be added or updated"
+        name: "tapi.path.computation.PathServiceEndPoint.body-param"
+        description: "tapi.path.computation.PathServiceEndPoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.path.computation.PathServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -19929,18 +20773,17 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
+      summary: "removes tapi.path.computation.PathServiceEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "cost-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of cost-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -19948,114 +20791,34 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/
   : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
+      summary: "returns tapi.common.Capacity"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "traffic-property-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of latency-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.topology.LatencyCharacteristic"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.topology.LatencyCharacteristic.body-param"
-        description: "tapi.topology.LatencyCharacteristic to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
-        required: true
-        type: "string"
-      responses:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/:
-    get:
+    post:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20063,30 +20826,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -20097,7 +20847,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      summary: "creates or updates tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20105,12 +20855,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
+        name: "tapi.common.Capacity.body-param"
+        description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -20121,7 +20876,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "removes tapi.common.Capacity"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20129,165 +20884,44 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of end-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
       responses:
-        201:
-          description: "Object created"
         400:
           description: "Internal error"
         204:
-          description: "Object modified"
-    delete:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.path.computation.ValueOrPriority"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.path.computation.ValueOrPriority.body-param"
-        description: "tapi.path.computation.ValueOrPriority to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-path-computation"
-      summary: "removes tapi.path.computation.ValueOrPriority"
+      summary: "creates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20295,29 +20929,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "creates tapi.topology.RiskCharacteristic"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of path-comp-service"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added to list"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -20325,34 +20947,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
-  : get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      summary: "creates or updates tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20360,17 +20958,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.topology.RiskCharacteristic.body-param"
-        description: "tapi.topology.RiskCharacteristic to be added or updated"
+        name: "tapi.common.BandwidthProfile.body-param"
+        description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -20381,7 +20979,7 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.topology.RiskCharacteristic"
+      summary: "removes tapi.common.BandwidthProfile"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20389,9 +20987,9 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "risk-characteristic-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of risk-diversity-characteristic"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -20399,11 +20997,11 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/path-computation-context/path-comp-service={uuid}/topology-constraint/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-path-computation"
-      summary: "returns tapi.path.computation.TopologyConstraint"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20411,17 +21009,22 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.path.computation.TopologyConstraint"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
       tags:
       - "tapi-path-computation"
-      summary: "creates tapi.path.computation.TopologyConstraint"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20429,12 +21032,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -20445,7 +21053,7 @@ paths:
     put:
       tags:
       - "tapi-path-computation"
-      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
@@ -20453,12 +21061,17 @@ paths:
         description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.path.computation.TopologyConstraint.body-param"
-        description: "tapi.path.computation.TopologyConstraint to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -20469,1462 +21082,70 @@ paths:
     delete:
       tags:
       - "tapi-path-computation"
-      summary: "removes tapi.path.computation.TopologyConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path-comp-service"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/path-computation-context/path={uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.Path"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.Path"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.Path"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.LinkRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      - name: "link-uuid"
-        in: "path"
-        description: "Id of link"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LinkRef"
-          schema:
-            $ref: "#/definitions/tapi.topology.LinkRef"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.RoutingConstraint"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.RoutingConstraint"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.CostCharacteristic"
-      description: "The list of costs where each cost relates to some aspect of the\
-        \ TopologicalEntity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "cost-name"
-        in: "path"
-        description: "Id of cost-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.CostCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.LatencyCharacteristic"
-      description: "The effect on the latency of a queuing process. This only has\
-        \ significant effect for packet based systems and has a complex characteristic."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "traffic-property-name"
-        in: "path"
-        description: "Id of latency-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.LatencyCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "Delay unit is microseconds."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.path.computation.ValueOrPriority"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.path.computation.ValueOrPriority"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
-        400:
-          description: "Internal error"
-  /data/context/path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/:
-    get:
-      tags:
-      - "tapi-path-computation"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of path"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-diversity-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.PhysicalContext"
-      description: "none"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.equipment.PhysicalContext"
-          schema:
-            $ref: "#/definitions/tapi.equipment.PhysicalContext"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-equipment"
-      summary: "creates tapi.equipment.PhysicalContext"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.equipment.PhysicalContext.body-param"
-        description: "tapi.equipment.PhysicalContext to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.equipment.PhysicalContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "tapi-equipment"
-      summary: "creates or updates tapi.equipment.PhysicalContext"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.equipment.PhysicalContext.body-param"
-        description: "tapi.equipment.PhysicalContext to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.equipment.PhysicalContext"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-equipment"
-      summary: "removes tapi.equipment.PhysicalContext"
-      description: "none"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/physical-context/device={uuid}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.Device"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.Device"
-          schema:
-            $ref: "#/definitions/tapi.equipment.Device"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AccessPort"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "access-port-uuid"
-        in: "path"
-        description: "Id of access-port"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.AccessPort"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AccessPort"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ConnectorPinAddress"
-      description: "The list of Pins that support the AccessPort."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "access-port-uuid"
-        in: "path"
-        description: "Id of access-port"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "pin-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ConnectorPinAddress"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ConnectorPinAddress"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.PinAndRole"
-      description: "If there is more than one pin used in a connector and/or there\
-        \ is a need to identify the role of one or more pins then this property can\
-        \ be used.\r\n                For simple cases pinIdentification can be used\
-        \ instead."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "access-port-uuid"
-        in: "path"
-        description: "Id of access-port"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "pin-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.PinAndRole"
-          schema:
-            $ref: "#/definitions/tapi.equipment.PinAndRole"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/access-port={access-port-uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "access-port-uuid"
-        in: "path"
-        description: "Id of access-port"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.Equipment"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.Equipment"
-          schema:
-            $ref: "#/definitions/tapi.equipment.Equipment"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ActualEquipment"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ActualEquipment"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ActualEquipment"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ActualNonFieldReplaceableModule"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ActualNonFieldReplaceableModule"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ActualNonFieldReplaceableModule"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-actual-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonActualProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonActualProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonActualProperties"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/actual-non-field-replaceable-module/common-equipment-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonEquipmentProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-actual-properties/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonActualProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonActualProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonActualProperties"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/actual-equipment/common-equipment-properties/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonEquipmentProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.Holder"
-      description: "References the Holder in an Equipment that is available to take\
-        \ other Equipments.\r\n                For example:\r\n                - Slot\
-        \ in a sub-rack\r\n                - Slot in a Field Replaceable Unit that\
-        \ can take a small form-factor pluggable."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.Holder"
-          schema:
-            $ref: "#/definitions/tapi.equipment.Holder"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ActualHolder"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ActualHolder"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ActualHolder"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/actual-holder/common-holder-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonHolderProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonHolderProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedHolder"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ExpectedHolder"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedHolder"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/expected-holder/common-holder-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonHolderProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonHolderProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/contained-holder={contained-holder-uuid}/occupying-fru/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.EquipmentRef"
-      description: "The FRU that is occupying the holder. \r\n                A holder\
-        \ may be unoccupied. \r\n                An FRU may occupy more hat one holder\
-        \ (using or blocking are intentionally not distinguished here)."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "contained-holder-uuid"
-        in: "path"
-        description: "Id of contained-holder"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.EquipmentRef"
-          schema:
-            $ref: "#/definitions/tapi.equipment.EquipmentRef"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedEquipment"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ExpectedEquipment"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedEquipment"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/common-equipment-properties/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonEquipmentProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedHolder"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ExpectedHolder"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedHolder"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-holder/common-holder-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonHolderProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonHolderProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ExpectedNonFieldReplaceableModule"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ExpectedNonFieldReplaceableModule"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ExpectedNonFieldReplaceableModule"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/expected-equipment/expected-non-field-replaceable-module/common-equipment-properties/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.CommonEquipmentProperties"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.CommonEquipmentProperties"
-          schema:
-            $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/equipment={equipment-uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of equipment"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/device={uuid}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of device"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/name/:
-    post:
-      tags:
-      - "tapi-equipment"
-      summary: "creates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/physical-context/name={value-name}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-equipment"
-      summary: "creates or updates tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "tapi.common.NameAndValue.body-param"
-        description: "tapi.common.NameAndValue to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-equipment"
-      summary: "removes tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/physical-context/physical-span={uuid}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.PhysicalSpan"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.PhysicalSpan"
-          schema:
-            $ref: "#/definitions/tapi.equipment.PhysicalSpan"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AbstractStrand"
-      description: "Both the serial segments that form an end-end strand and the parallel\
-        \ end-end strands."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.AbstractStrand"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AbstractStrand"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/adjacent-strand={physical-span-uuid},{abstract-strand-local-id}/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AbstractStrandRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "physical-span-uuid"
-        in: "path"
-        description: "Id of adjacent-strand"
-        required: true
-        type: "string"
-      - name: "abstract-strand-local-id"
-        in: "path"
-        description: "Id of adjacent-strand"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.AbstractStrandRef"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AbstractStrandRef"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.ConnectorPinAddress"
-      description: "A strand can end on two or more Pins (usually 2 pins, but a strand\
-        \ my be spliced to split a signal). This model supports only 2 ended strands.\r\
-        \n                A abstract strand may be spliced at both ends and hence\
-        \ have no direct relationship to pins or may be connected to pins at one or\
-        \ both ends.\r\n                In the essential model these Pins would be\
-        \ on connectors that plug in to connectors on Equipments.\r\n            \
-        \    The AbstractStrand is extended to the pins of the AccessPort which are\
-        \ the Pins on the Connectors of the Equipment.\r\n                In some\
-        \ cases it may not be relevant to represent the pin detail and hence the reference\
-        \ is to a connector alone."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "pin-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.ConnectorPinAddress"
-          schema:
-            $ref: "#/definitions/tapi.equipment.ConnectorPinAddress"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/connector-pin={connector-identification},{pin-identification},{equipment-uuid}/pin-and-role/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.PinAndRole"
-      description: "If there is more than one pin used in a connector and/or there\
-        \ is a need to identify the role of one or more pins then this property can\
-        \ be used.\r\n                For simple cases pinIdentification can be used\
-        \ instead."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "connector-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "pin-identification"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      - name: "equipment-uuid"
-        in: "path"
-        description: "Id of connector-pin"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.PinAndRole"
-          schema:
-            $ref: "#/definitions/tapi.equipment.PinAndRole"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/name={value-name}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  ? /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/spliced-strand={physical-span-uuid},{abstract-strand-local-id}/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AbstractStrandRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "physical-span-uuid"
-        in: "path"
-        description: "Id of spliced-strand"
-        required: true
-        type: "string"
-      - name: "abstract-strand-local-id"
-        in: "path"
-        description: "Id of spliced-strand"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.AbstractStrandRef"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AbstractStrandRef"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/abstract-strand={local-id}/strand-media-characteristics={value-name}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "Relevant physical properties of the abstract strand."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of abstract-strand"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of strand-media-characteristics"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/access-port={device-uuid},{access-port-uuid}/:
-    get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AccessPortRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of physical-span"
-        required: true
-        type: "string"
-      - name: "device-uuid"
+      summary: "removes tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of access-port"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "access-port-uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of access-port"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.equipment.AccessPortRef"
-          schema:
-            $ref: "#/definitions/tapi.equipment.AccessPortRef"
         400:
           description: "Internal error"
-  /data/context/physical-context/physical-span={uuid}/name={value-name}/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/committed-information-rate/
+  : get:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-path-computation"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of physical-span"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "local-id"
         in: "path"
-        description: "Id of name"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point/:
     post:
       tags:
-      - "tapi-common"
-      summary: "creates tapi.common.context.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.common.context.ServiceInterfacePoint.body-param"
-        description: "tapi.common.context.ServiceInterfacePoint to be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -21932,42 +21153,28 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.context.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.context.ServiceInterfacePoint"
-          schema:
-            $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.context.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.common.context.ServiceInterfacePoint.body-param"
-        description: "tapi.common.context.ServiceInterfacePoint to be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -21977,13 +21184,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.context.ServiceInterfacePoint"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -21991,177 +21203,155 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
+      - "tapi-path-computation"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.Capacity"
-          schema:
-            $ref: "#/definitions/tapi.common.Capacity"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/:
-    get:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-        400:
-          description: "Internal error"
-    post:
-      tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
-          \ be added to list"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22171,22 +21361,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.MediaChannelServiceInterfacePointSpec to\
-          \ be added or updated"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22196,13 +21390,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
@@ -22210,248 +21409,286 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/capacity/total-size/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelPoolCapabilityPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
-  : get:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of available-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of available-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
-  : get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
-        in: "path"
-        description: "Id of available-spectrum"
-        required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of available-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.common.CapacityValue.body-param"
+        description: "tapi.common.CapacityValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name/:
+    post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of path-comp-service"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/name={value-name}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+        type: "string"
+      - name: "value-name"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of name"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+        type: "string"
+      - name: "value-name"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of name"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.SpectrumBand"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "upper-frequency"
+      - name: "local-id"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of end-point"
         required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+        type: "string"
+      - name: "value-name"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of name"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementCapabilityPac"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "creates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ to list"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -22461,22 +21698,26 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of end-point"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ or updated"
+        name: "tapi.common.ServiceInterfacePointRef.body-param"
+        description: "tapi.common.ServiceInterfacePointRef to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
       responses:
         201:
           description: "Object created"
@@ -22486,60 +21727,45 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "removes tapi.common.ServiceInterfacePointRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
-  : get:
-      tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
-      parameters:
-      - name: "uuid"
+      - name: "local-id"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of end-point"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerProperties"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name/:
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22547,25 +21773,56 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/name={value-name}/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22575,15 +21832,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -22591,46 +21853,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.PathObjectiveFunction"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -22640,23 +21898,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.PathObjectiveFunction.body-param"
+        description: "tapi.path.computation.PathObjectiveFunction to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.PathObjectiveFunctionWrapper"
       responses:
         201:
           description: "Object created"
@@ -22666,15 +21922,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.PathObjectiveFunction"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -22682,69 +21936,83 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name/:
+    post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerProperties"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/objective-function/name={value-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.common.NameAndValue.body-param"
+        description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22754,14 +22022,20 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
@@ -22769,44 +22043,43 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/media-channel-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.PathOptimizationConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -22816,22 +22089,22 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.PathOptimizationConstraint.body-param"
+        description: "tapi.path.computation.PathOptimizationConstraint to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -22841,14 +22114,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.PathOptimizationConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -22856,10 +22128,10 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/name/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -22867,7 +22139,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
@@ -22875,7 +22147,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22883,10 +22155,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/optimization-constraint/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -22894,7 +22166,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - name: "value-name"
@@ -22906,12 +22178,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -22919,7 +22191,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - name: "value-name"
@@ -22932,7 +22204,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -22942,7 +22214,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-path-computation"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -22950,7 +22222,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - name: "value-name"
@@ -22963,43 +22235,66 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/path={path-uuid}/:
     get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.PathRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "path-uuid"
+        in: "path"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.OtsiServiceInterfacePointSpec"
+          description: "tapi.path.computation.PathRef"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.PathRefWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/:
+    get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.path.computation.RoutingConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.OtsiServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
-          \ to list"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -23009,22 +22304,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.OtsiServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.OtsiServiceInterfacePointSpec.body-param"
-        description: "tapi.photonic.media.OtsiServiceInterfacePointSpec to be added\
-          \ or updated"
+        name: "tapi.path.computation.RoutingConstraint.body-param"
+        description: "tapi.path.computation.RoutingConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
+          $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -23034,13 +22328,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.OtsiServiceInterfacePointSpec"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -23048,205 +22342,248 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/:
-    get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic/
+  : post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.OtsiCapabilityPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.OtsiCapabilityPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiCapabilityPac"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-application-identifier={application-code}/
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/cost-characteristic={cost-name}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.ApplicationIdentifier"
-      description: "The list of supportable ApplicationIdentifiers."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "application-code"
+      - name: "cost-name"
         in: "path"
-        description: "Id of supportable-application-identifier"
+        description: "Id of cost-characteristic"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.ApplicationIdentifier"
+          description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-lower-central-frequency={central-frequency}/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The lower frequency of the channel spectrum"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
+      - name: "cost-name"
         in: "path"
-        description: "Id of supportable-lower-central-frequency"
+        description: "Id of cost-characteristic"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.topology.CostCharacteristic.body-param"
+        description: "tapi.topology.CostCharacteristic to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.CentralFrequency"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-lower-central-frequency={central-frequency}/frequency-constraint/
-  : get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
+        required: true
+        type: "string"
+      responses:
+        400:
+          description: "Internal error"
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic/
+  : post:
+      tags:
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
-        in: "path"
-        description: "Id of supportable-lower-central-frequency"
-        required: true
-        type: "integer"
-        format: "int32"
+      - in: "body"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-upper-central-frequency={central-frequency}/
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.CentralFrequency"
-      description: "The Upper frequency of the channel spectrum"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of supportable-upper-central-frequency"
+        description: "Id of latency-characteristic"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.CentralFrequency"
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/supportable-upper-central-frequency={central-frequency}/frequency-constraint/
-  : get:
+    put:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
-      - name: "central-frequency"
+      - name: "traffic-property-name"
         in: "path"
-        description: "Id of supportable-upper-central-frequency"
+        description: "Id of latency-characteristic"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - in: "body"
+        name: "tapi.topology.LatencyCharacteristic.body-param"
+        description: "tapi.topology.LatencyCharacteristic to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/otsi-capability/total-power-warn-threshold/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.TotalPowerThresholdPac"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.photonic.media.TotalPowerThresholdPac"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPac"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/:
-    get:
+        204:
+          description: "Object deleted"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-cost/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerManagementCapabilityPac"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -23256,22 +22593,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerManagementCapabilityPac.body-param"
-        description: "tapi.photonic.media.PowerManagementCapabilityPac to be added\
-          \ or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -23281,13 +22617,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerManagementCapabilityPac"
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -23295,46 +22631,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/supportable-maximum-output-power/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-delay/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -23344,23 +22676,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -23370,15 +22700,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -23386,46 +22714,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/supportable-minimum-output-power/
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/max-allowed-hops/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -23435,23 +22759,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.ValueOrPriority.body-param"
+        description: "tapi.path.computation.ValueOrPriority to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
       responses:
         201:
           description: "Object created"
@@ -23461,15 +22783,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum output power supported\r\n\
-        \                at the Logical-Termination-Point (LTP) associated to the\
-        \ SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -23477,69 +22797,77 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/tolerable-maximum-input-power/
-  : get:
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic/
+  : post:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
-        200:
-          description: "tapi.photonic.media.PowerProperties"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-    post:
+        409:
+          description: "Object already exists"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.topology.RiskCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.topology.RiskCharacteristic.body-param"
+        description: "tapi.topology.RiskCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -23549,14 +22877,18 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the maximum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.topology.RiskCharacteristic"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
         required: true
         type: "string"
       responses:
@@ -23564,44 +22896,42 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/service-interface-point={uuid}/otsi-service-interface-point-spec/power-management-capability/tolerable-minimum-input-power/
-  : get:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path-comp-service={uuid}/topology-constraint/:
+    get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerProperties"
+          description: "tapi.path.computation.TopologyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+            $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
         400:
           description: "Internal error"
     post:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added to list"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -23611,22 +22941,21 @@ paths:
           description: "Object already exists"
     put:
       tags:
-      - "tapi-photonic-media"
-      summary: "creates or updates tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "creates or updates tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.photonic.media.PowerProperties.body-param"
-        description: "tapi.photonic.media.PowerProperties to be added or updated"
+        name: "tapi.path.computation.TopologyConstraint.body-param"
+        description: "tapi.path.computation.TopologyConstraint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+          $ref: "#/definitions/tapi.path.computation.TopologyConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -23636,14 +22965,13 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-photonic-media"
-      summary: "removes tapi.photonic.media.PowerProperties"
-      description: "This parameter exposes the minimum input power tolerated\r\n \
-        \               at the Logical-Termination-Point (LTP) associated to the SIP."
+      - "tapi-path-computation"
+      summary: "removes tapi.path.computation.TopologyConstraint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path-comp-service"
         required: true
         type: "string"
       responses:
@@ -23651,142 +22979,231 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.Path"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.path.computation.Path"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.path.computation.PathWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/link={topology-uuid},{link-uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LinkRef"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of link"
+        required: true
+        type: "string"
+      - name: "link-uuid"
+        in: "path"
+        description: "Id of link"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.topology.LinkRef"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.topology.LinkRefWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.RoutingConstraint"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.RoutingConstraint"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.RoutingConstraintWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/cost-characteristic={cost-name}/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.CostCharacteristic"
+      description: "The list of costs where each cost relates to some aspect of the\
+        \ TopologicalEntity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "cost-name"
+        in: "path"
+        description: "Id of cost-characteristic"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.CostCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/latency-characteristic={traffic-property-name}/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.LatencyCharacteristic"
+      description: "The effect on the latency of a queuing process. This only has\
+        \ significant effect for packet based systems and has a complex characteristic."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "traffic-property-name"
+        in: "path"
+        description: "Id of latency-characteristic"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-cost/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-delay/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "Delay unit is microseconds."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/max-allowed-hops/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-path-computation"
+      summary: "returns tapi.path.computation.ValueOrPriority"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of path"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.path.computation.ValueOrPriority"
+          schema:
+            $ref: "#/definitions/tapi.path.computation.ValueOrPriorityWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-path-computation:path-computation-context/path={uuid}/routing-constraint/risk-diversity-characteristic={risk-characteristic-name}/
+  : get:
+      tags:
+      - "tapi-path-computation"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of path"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-diversity-characteristic"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-admin-context/:
+  /data/tapi-common:context/tapi-streaming:stream-admin-context/:
     get:
       tags:
       - "tapi-streaming"
@@ -23797,7 +23214,7 @@ paths:
         200:
           description: "tapi.streaming.StreamAdminContext"
           schema:
-            $ref: "#/definitions/tapi.streaming.StreamAdminContext"
+            $ref: "#/definitions/tapi.streaming.StreamAdminContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -23811,7 +23228,7 @@ paths:
         description: "tapi.streaming.StreamAdminContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.streaming.StreamAdminContext"
+          $ref: "#/definitions/tapi.streaming.StreamAdminContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -23830,7 +23247,7 @@ paths:
         description: "tapi.streaming.StreamAdminContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.streaming.StreamAdminContext"
+          $ref: "#/definitions/tapi.streaming.StreamAdminContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -23849,7 +23266,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/stream-admin-context/name/:
+  /data/tapi-common:context/tapi-streaming:stream-admin-context/name/:
     post:
       tags:
       - "tapi-streaming"
@@ -23863,7 +23280,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -23871,7 +23288,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/stream-admin-context/name={value-name}/:
+  /data/tapi-common:context/tapi-streaming:stream-admin-context/name={value-name}/:
     get:
       tags:
       - "tapi-streaming"
@@ -23889,7 +23306,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -23910,7 +23327,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -23936,7 +23353,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/stream-admin-context/stream-monitor={uuid}/:
+  /data/tapi-common:context/tapi-streaming:stream-admin-context/stream-monitor={uuid}/:
     get:
       tags:
       - "tapi-streaming"
@@ -23952,10 +23369,10 @@ paths:
         200:
           description: "tapi.streaming.StreamMonitor"
           schema:
-            $ref: "#/definitions/tapi.streaming.StreamMonitor"
+            $ref: "#/definitions/tapi.streaming.StreamMonitorWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-admin-context/stream-monitor={uuid}/available-stream/:
+  /data/tapi-common:context/tapi-streaming:stream-admin-context/stream-monitor={uuid}/available-stream/:
     get:
       tags:
       - "tapi-streaming"
@@ -23971,10 +23388,10 @@ paths:
         200:
           description: "tapi.streaming.AvailableStreamRef"
           schema:
-            $ref: "#/definitions/tapi.streaming.AvailableStreamRef"
+            $ref: "#/definitions/tapi.streaming.AvailableStreamRefWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-admin-context/stream-monitor={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-streaming:stream-admin-context/stream-monitor={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-streaming"
@@ -23997,10 +23414,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/:
+  /data/tapi-common:context/tapi-streaming:stream-context/:
     get:
       tags:
       - "tapi-streaming"
@@ -24011,7 +23428,7 @@ paths:
         200:
           description: "tapi.streaming.context.StreamContext"
           schema:
-            $ref: "#/definitions/tapi.streaming.context.StreamContext"
+            $ref: "#/definitions/tapi.streaming.context.StreamContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -24025,7 +23442,7 @@ paths:
         description: "tapi.streaming.context.StreamContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.streaming.context.StreamContext"
+          $ref: "#/definitions/tapi.streaming.context.StreamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -24044,7 +23461,7 @@ paths:
         description: "tapi.streaming.context.StreamContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.streaming.context.StreamContext"
+          $ref: "#/definitions/tapi.streaming.context.StreamContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -24063,7 +23480,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/stream-context/available-stream={uuid}/:
+  /data/tapi-common:context/tapi-streaming:stream-context/available-stream={uuid}/:
     get:
       tags:
       - "tapi-streaming"
@@ -24079,10 +23496,10 @@ paths:
         200:
           description: "tapi.streaming.AvailableStream"
           schema:
-            $ref: "#/definitions/tapi.streaming.AvailableStream"
+            $ref: "#/definitions/tapi.streaming.AvailableStreamWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/available-stream={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-streaming:stream-context/available-stream={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-streaming"
@@ -24105,10 +23522,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/available-stream={uuid}/supported-stream-type/:
+  /data/tapi-common:context/tapi-streaming:stream-context/available-stream={uuid}/supported-stream-type/:
     get:
       tags:
       - "tapi-streaming"
@@ -24124,10 +23541,10 @@ paths:
         200:
           description: "tapi.streaming.SupportedStreamTypeRef"
           schema:
-            $ref: "#/definitions/tapi.streaming.SupportedStreamTypeRef"
+            $ref: "#/definitions/tapi.streaming.SupportedStreamTypeRefWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/supported-stream-type={uuid}/:
+  /data/tapi-common:context/tapi-streaming:stream-context/supported-stream-type={uuid}/:
     get:
       tags:
       - "tapi-streaming"
@@ -24143,10 +23560,10 @@ paths:
         200:
           description: "tapi.streaming.streamcontext.SupportedStreamType"
           schema:
-            $ref: "#/definitions/tapi.streaming.streamcontext.SupportedStreamType"
+            $ref: "#/definitions/tapi.streaming.streamcontext.SupportedStreamTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/supported-stream-type={uuid}/compacted-log-details/:
+  /data/tapi-common:context/tapi-streaming:stream-context/supported-stream-type={uuid}/compacted-log-details/:
     get:
       tags:
       - "tapi-streaming"
@@ -24162,10 +23579,10 @@ paths:
         200:
           description: "tapi.streaming.CompactedLogDetails"
           schema:
-            $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
+            $ref: "#/definitions/tapi.streaming.CompactedLogDetailsWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/supported-stream-type={uuid}/connection-protocol-details/:
+  /data/tapi-common:context/tapi-streaming:stream-context/supported-stream-type={uuid}/connection-protocol-details/:
     get:
       tags:
       - "tapi-streaming"
@@ -24181,10 +23598,10 @@ paths:
         200:
           description: "tapi.streaming.ConnectionProtocolDetails"
           schema:
-            $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
+            $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetailsWrapper"
         400:
           description: "Internal error"
-  /data/context/stream-context/supported-stream-type={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-streaming:stream-context/supported-stream-type={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-streaming"
@@ -24207,10 +23624,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -24221,7 +23638,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -24235,7 +23652,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -24254,7 +23671,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -24273,7 +23690,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -24284,10 +23701,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -24305,10 +23722,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -24324,10 +23741,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -24343,10 +23760,10 @@ paths:
         200:
           description: "tapi.topology.topologycontext.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.topologycontext.Topology"
+            $ref: "#/definitions/tapi.topology.topologycontext.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -24367,10 +23784,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -24391,10 +23808,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -24415,11 +23832,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -24439,10 +23856,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -24463,11 +23880,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -24487,11 +23904,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -24511,10 +23928,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -24536,10 +23953,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -24566,11 +23983,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -24596,10 +24013,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -24627,10 +24044,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -24666,10 +24083,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -24690,11 +24107,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -24720,10 +24137,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -24745,11 +24162,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -24769,10 +24186,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -24793,10 +24210,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -24817,11 +24234,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -24841,10 +24258,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -24865,10 +24282,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -24890,11 +24307,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -24920,10 +24337,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -24946,10 +24363,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -24970,10 +24387,10 @@ paths:
         200:
           description: "tapi.topology.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.topology.Node"
+            $ref: "#/definitions/tapi.topology.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -25009,10 +24426,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -25033,10 +24450,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -25057,11 +24474,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -25081,10 +24498,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -25105,11 +24522,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -25129,11 +24546,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -25153,10 +24570,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -25178,10 +24595,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -25208,10 +24625,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -25232,11 +24649,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -25262,10 +24679,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -25293,11 +24710,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -25322,11 +24739,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -25351,10 +24768,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -25380,10 +24797,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -25409,10 +24826,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -25438,10 +24855,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -25467,10 +24884,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -25496,10 +24913,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -25526,10 +24943,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -25561,10 +24978,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -25597,10 +25014,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -25649,10 +25066,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -25683,10 +25100,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -25717,10 +25134,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -25751,10 +25168,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -25785,10 +25202,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -25819,10 +25236,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -25853,10 +25270,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -25888,10 +25305,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -25928,10 +25345,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -25968,222 +25385,222 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "node-rule-group-uuid"
-        in: "path"
-        description: "Id of node-rule-group"
-        required: true
-        type: "string"
-      - name: "inter-rule-group-uuid"
-        in: "path"
-        description: "Id of inter-rule-group"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.topology.RiskCharacteristic"
-      description: "A list of risk characteristics for consideration in an analysis\
-        \ of shared risk. Each element of the list represents a specific risk consideration."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "node-rule-group-uuid"
-        in: "path"
-        description: "Id of node-rule-group"
-        required: true
-        type: "string"
-      - name: "inter-rule-group-uuid"
-        in: "path"
-        description: "Id of inter-rule-group"
-        required: true
-        type: "string"
-      - name: "risk-characteristic-name"
-        in: "path"
-        description: "Id of risk-characteristic"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.RiskCharacteristic"
-          schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.topology.Rule"
-      description: "The list of rules of the InterRuleGroup."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "node-rule-group-uuid"
-        in: "path"
-        description: "Id of node-rule-group"
-        required: true
-        type: "string"
-      - name: "inter-rule-group-uuid"
-        in: "path"
-        description: "Id of inter-rule-group"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of rule"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.Rule"
-          schema:
-            $ref: "#/definitions/tapi.topology.Rule"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.topology.PortRoleRule"
-      description: "Indicates the port role to which the rule applies. \r\n      \
-        \          The port role is interpreted in the context of the connection type\
-        \ which is identified by the connection spec. \r\n                The port\
-        \ role is not meaningful in the absence of a connection spec reference.\r\n\
-        \                If a node rule group carries a port role, that role applies\
-        \ also to the associated inter rule where the combination of the roles in\
-        \ the node rule groups at the ends of the inter group rule define the connection\
-        \ orientation.\r\n                For example a root-and-leaf connection may\
-        \ be used in a node where a node rule group collects one set of NEPs has the\
-        \ port role 'root' and another node rule group collects another set of NEPs\
-        \ has the port role 'leaf' where these are joined by an inter rule group.\
-        \ This combination specifies an allowed orientation of the root-and-leaf connection.\r\
-        \n                No port role statement means all port roles are allowed."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "node-rule-group-uuid"
-        in: "path"
-        description: "Id of node-rule-group"
-        required: true
-        type: "string"
-      - name: "inter-rule-group-uuid"
-        in: "path"
-        description: "Id of inter-rule-group"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of rule"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.PortRoleRule"
-          schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.topology.ConnectionSpecReference"
-      description: "Identifies the type of connection that the rule applies to. \r\
-        \n                If the attribute is not present then the rule applies to\
-        \ all types of connection supported by the device."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "node-rule-group-uuid"
-        in: "path"
-        description: "Id of node-rule-group"
-        required: true
-        type: "string"
-      - name: "inter-rule-group-uuid"
-        in: "path"
-        description: "Id of inter-rule-group"
-        required: true
-        type: "string"
-      - name: "local-id"
-        in: "path"
-        description: "Id of rule"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.topology.ConnectionSpecReference"
-          schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "node-rule-group-uuid"
+        in: "path"
+        description: "Id of node-rule-group"
+        required: true
+        type: "string"
+      - name: "inter-rule-group-uuid"
+        in: "path"
+        description: "Id of inter-rule-group"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.NameAndValue"
+          schema:
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.topology.RiskCharacteristic"
+      description: "A list of risk characteristics for consideration in an analysis\
+        \ of shared risk. Each element of the list represents a specific risk consideration."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "node-rule-group-uuid"
+        in: "path"
+        description: "Id of node-rule-group"
+        required: true
+        type: "string"
+      - name: "inter-rule-group-uuid"
+        in: "path"
+        description: "Id of inter-rule-group"
+        required: true
+        type: "string"
+      - name: "risk-characteristic-name"
+        in: "path"
+        description: "Id of risk-characteristic"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.RiskCharacteristic"
+          schema:
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.topology.Rule"
+      description: "The list of rules of the InterRuleGroup."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "node-rule-group-uuid"
+        in: "path"
+        description: "Id of node-rule-group"
+        required: true
+        type: "string"
+      - name: "inter-rule-group-uuid"
+        in: "path"
+        description: "Id of inter-rule-group"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of rule"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.Rule"
+          schema:
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.topology.PortRoleRule"
+      description: "Indicates the port role to which the rule applies. \r\n      \
+        \          The port role is interpreted in the context of the connection type\
+        \ which is identified by the connection spec. \r\n                The port\
+        \ role is not meaningful in the absence of a connection spec reference.\r\n\
+        \                If a node rule group carries a port role, that role applies\
+        \ also to the associated inter rule where the combination of the roles in\
+        \ the node rule groups at the ends of the inter group rule define the connection\
+        \ orientation.\r\n                For example a root-and-leaf connection may\
+        \ be used in a node where a node rule group collects one set of NEPs has the\
+        \ port role 'root' and another node rule group collects another set of NEPs\
+        \ has the port role 'leaf' where these are joined by an inter rule group.\
+        \ This combination specifies an allowed orientation of the root-and-leaf connection.\r\
+        \n                No port role statement means all port roles are allowed."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "node-rule-group-uuid"
+        in: "path"
+        description: "Id of node-rule-group"
+        required: true
+        type: "string"
+      - name: "inter-rule-group-uuid"
+        in: "path"
+        description: "Id of inter-rule-group"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of rule"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.PortRoleRule"
+          schema:
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  : get:
+      tags:
+      - "tapi-topology"
+      summary: "returns tapi.topology.ConnectionSpecReference"
+      description: "Identifies the type of connection that the rule applies to. \r\
+        \n                If the attribute is not present then the rule applies to\
+        \ all types of connection supported by the device."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "node-rule-group-uuid"
+        in: "path"
+        description: "Id of node-rule-group"
+        required: true
+        type: "string"
+      - name: "inter-rule-group-uuid"
+        in: "path"
+        description: "Id of inter-rule-group"
+        required: true
+        type: "string"
+      - name: "local-id"
+        in: "path"
+        description: "Id of rule"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.topology.ConnectionSpecReference"
+          schema:
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -26226,10 +25643,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -26267,10 +25684,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -26302,10 +25719,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -26336,10 +25753,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -26370,10 +25787,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -26404,10 +25821,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -26438,10 +25855,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -26472,10 +25889,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -26507,10 +25924,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -26542,11 +25959,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -26578,10 +25995,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -26622,10 +26039,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -26668,10 +26085,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -26703,11 +26120,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -26737,10 +26154,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -26783,10 +26200,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -26819,10 +26236,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -26860,10 +26277,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -26896,10 +26313,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -26926,10 +26343,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -26955,10 +26372,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -26984,10 +26401,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -27013,10 +26430,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -27042,10 +26459,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -27071,10 +26488,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -27101,11 +26518,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.node.OwnedNodeEdgePoint"
@@ -27130,10 +26547,10 @@ paths:
         200:
           description: "tapi.topology.node.OwnedNodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -27174,10 +26591,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -27203,10 +26620,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -27232,10 +26649,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -27261,10 +26678,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -27290,10 +26707,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -27319,10 +26736,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -27348,10 +26765,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -27378,15 +26795,17 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
-      description: "none"
+      - "tapi-topology"
+      summary: "returns tapi.common.ServiceInterfacePointRef"
+      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
+        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
+        \ should be considered experimental"
       parameters:
       - name: "uuid"
         in: "path"
@@ -27403,19 +26822,26 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
+      - name: "service-interface-point-uuid"
+        in: "path"
+        description: "Id of mapped-service-interface-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+          description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ceplist.ConnectionEndPoint"
-      description: "none"
+      - "tapi-topology"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -27432,23 +26858,23 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of connection-end-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ceplist.ConnectionEndPoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      summary: "returns tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -27466,47 +26892,19 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "aggregated-connection-end-point-node-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
-      - name: "aggregated-connection-end-point-connection-end-point-uuid"
-        in: "path"
-        description: "Id of aggregated-connection-end-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionEndPointRef"
+          description: "tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
+            $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.CepRole"
-      description: "Defines the role of the CEP in the context of the connection spec.\r\
-        \n                There may be many cep role - connection spec combinations\
-        \ for a particular CEP where each corresponds to a specific connection associated\
-        \ with the CEP."
+      summary: "returns tapi.connectivity.ceplist.ConnectionEndPoint"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -27530,17 +26928,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.connectivity.CepRole"
+          description: "tapi.connectivity.ceplist.ConnectionEndPoint"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CepRole"
+            $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/aggregated-connection-end-point={topology-uuid},{aggregated-connection-end-point-node-uuid},{node-edge-point-uuid},{aggregated-connection-end-point-connection-end-point-uuid}/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.connectivity.ConnectionSpecReference"
-      description: "The reference to the spec that defines the cep role."
+      summary: "returns tapi.connectivity.ConnectionEndPointRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -27562,19 +26960,42 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "aggregated-connection-end-point-node-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
+      - name: "aggregated-connection-end-point-connection-end-point-uuid"
+        in: "path"
+        description: "Id of aggregated-connection-end-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.connectivity.ConnectionSpecReference"
+          description: "tapi.connectivity.ConnectionEndPointRef"
           schema:
-            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/
   : get:
       tags:
       - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
-      description: "none"
+      summary: "returns tapi.connectivity.CepRole"
+      description: "Defines the role of the CEP in the context of the connection spec.\r\
+        \n                There may be many cep role - connection spec combinations\
+        \ for a particular CEP where each corresponds to a specific connection associated\
+        \ with the CEP."
       parameters:
       - name: "uuid"
         in: "path"
@@ -27596,35 +27017,19 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "topology-uuid"
-        in: "path"
-        description: "Id of client-node-edge-point"
-        required: true
-        type: "string"
-      - name: "client-node-edge-point-node-uuid"
-        in: "path"
-        description: "Id of client-node-edge-point"
-        required: true
-        type: "string"
-      - name: "node-edge-point-uuid"
-        in: "path"
-        description: "Id of client-node-edge-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.connectivity.CepRole"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.connectivity.CepRoleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/cep-role/connection-spec-reference/
   : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthConnectionEndPointSpec"
-      description: "Augments the base LayerProtocol information in ConnectionEndPoint\
-        \ with ETH-specific information"
+      - "tapi-connectivity"
+      summary: "returns tapi.connectivity.ConnectionSpecReference"
+      description: "The reference to the spec that defines the cep role."
       parameters:
       - name: "uuid"
         in: "path"
@@ -27648,16 +27053,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.EthConnectionEndPointSpec"
+          description: "tapi.connectivity.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.connectivity.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/client-node-edge-point={topology-uuid},{client-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.EthCtpPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -27680,28 +27085,36 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "topology-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      - name: "client-node-edge-point-node-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
+      - name: "node-edge-point-uuid"
+        in: "path"
+        description: "Id of client-node-edge-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.EthCtpPac"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.eth.EthCtpPac"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/filter-config/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
   : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.ControlFrameFilter"
-      description: "This attribute models the FilterConfig MI defined in section 8.3/G.8021.\
-        \ It indicates the configured filter action for each of the 33 group MAC addresses\
-        \ for control frames. The 33 MAC addresses are:\r\n                - All bridges\
-        \ address: 01-80-C2-00-00-10,\r\n                - Reserved addresses: 01-80-C2-00-00-00\
-        \ to 01-80-C2-00-00-0F,\r\n                - GARP Application addresses: 01-80-C2-00-00-20\
-        \ to 01-80-C2-00-00-2F.\r\n                The filter action is Pass or Block.\
-        \ \r\n                If the destination address of the incoming ETH_CI_D\
-        \ matches one of the above addresses, the filter process shall perform the\
-        \ corresponding configured filter action. \r\n                If none of the\
-        \ above addresses match, the ETH_CI_D is passed."
+      - "tapi-connectivity"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
@@ -27723,18 +27136,23 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.eth.ControlFrameFilter"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.eth.ControlFrameFilter"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-conditioning/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
   : get:
       tags:
-      - "tapi-eth"
-      summary: "returns tapi.eth.TrafficConditioningPac"
+      - "tapi-connectivity"
+      summary: "returns tapi.topology.NodeEdgePointRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -27759,24 +27177,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.TrafficConditioningPac"
+          description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.eth.TrafficConditioningPac"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-conditioning/cond-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.TrafficConditioningConfiguration"
-      description: "This attribute indicates for the conditioner process the conditioning\
-        \ parameters:\r\n                - Queue ID: Indicates the Queue ID\r\n  \
-        \              - Committed Information Rate (CIR): number of bits per second\r\
-        \n                - Committed Burst Size (CBS): number of bytes\r\n      \
-        \          - Excess Information Rate (EIR): number of bits per second\r\n\
-        \                - Excess Burst Size (EBS): number of bytes\r\n          \
-        \      - Coupling flag (CF): 0 or 1\r\n                - Color mode (CM):\
-        \ color-blind and color-aware."
+      summary: "returns tapi.eth.EthConnectionEndPointSpec"
+      description: "Augments the base LayerProtocol information in ConnectionEndPoint\
+        \ with ETH-specific information"
       parameters:
       - name: "uuid"
         in: "path"
@@ -27798,26 +27210,19 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "queue-id"
-        in: "path"
-        description: "Id of cond-config-list"
-        required: true
-        type: "integer"
-        format: "int32"
       responses:
         200:
-          description: "tapi.eth.TrafficConditioningConfiguration"
+          description: "tapi.eth.EthConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.eth.TrafficConditioningConfiguration"
+            $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-conditioning/prio-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.PriorityConfiguration"
-      description: "This attribute indicates the Priority Splitter function for the\
-        \ mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue."
+      summary: "returns tapi.eth.EthCtpPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -27839,25 +27244,28 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "queue-id"
-        in: "path"
-        description: "Id of prio-config-list"
-        required: true
-        type: "integer"
-        format: "int32"
       responses:
         200:
-          description: "tapi.eth.PriorityConfiguration"
+          description: "tapi.eth.EthCtpPac"
           schema:
-            $ref: "#/definitions/tapi.eth.PriorityConfiguration"
+            $ref: "#/definitions/tapi.eth.EthCtpPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-shaping/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/filter-config/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.TrafficShapingPac"
-      description: "none"
+      summary: "returns tapi.eth.ControlFrameFilter"
+      description: "This attribute models the FilterConfig MI defined in section 8.3/G.8021.\
+        \ It indicates the configured filter action for each of the 33 group MAC addresses\
+        \ for control frames. The 33 MAC addresses are:\r\n                - All bridges\
+        \ address: 01-80-C2-00-00-10,\r\n                - Reserved addresses: 01-80-C2-00-00-00\
+        \ to 01-80-C2-00-00-0F,\r\n                - GARP Application addresses: 01-80-C2-00-00-20\
+        \ to 01-80-C2-00-00-2F.\r\n                The filter action is Pass or Block.\
+        \ \r\n                If the destination address of the incoming ETH_CI_D\
+        \ matches one of the above addresses, the filter process shall perform the\
+        \ corresponding configured filter action. \r\n                If none of the\
+        \ above addresses match, the ETH_CI_D is passed."
       parameters:
       - name: "uuid"
         in: "path"
@@ -27881,18 +27289,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.TrafficShapingPac"
+          description: "tapi.eth.ControlFrameFilter"
           schema:
-            $ref: "#/definitions/tapi.eth.TrafficShapingPac"
+            $ref: "#/definitions/tapi.eth.ControlFrameFilterWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-shaping/prio-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-conditioning/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.PriorityConfiguration"
-      description: "This attribute configures the Priority Splitter function for the\
-        \ mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue."
+      summary: "returns tapi.eth.TrafficConditioningPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -27914,31 +27321,26 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "queue-id"
-        in: "path"
-        description: "Id of prio-config-list"
-        required: true
-        type: "integer"
-        format: "int32"
       responses:
         200:
-          description: "tapi.eth.PriorityConfiguration"
+          description: "tapi.eth.TrafficConditioningPac"
           schema:
-            $ref: "#/definitions/tapi.eth.PriorityConfiguration"
+            $ref: "#/definitions/tapi.eth.TrafficConditioningPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-ctp/traffic-shaping/queue-config-list={queue-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-conditioning/cond-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.QueueConfiguration"
-      description: "This attribute configures the Queue depth and Dropping threshold\
-        \ parameters of the Queue process. The Queue depth sets the maximum size of\
-        \ the queue in bytes. An incoming ETH_CI traffic unit is dropped if there\
-        \ is insufficient space in the queue to hold the whole unit. The Dropping\
-        \ threshold sets the threshold of the queue. If the queue is filled beyond\
-        \ this threshold, incoming ETH_CI traffic units accompanied by the ETH_CI_DE\
-        \ signal set are dropped."
+      summary: "returns tapi.eth.TrafficConditioningConfiguration"
+      description: "This attribute indicates for the conditioner process the conditioning\
+        \ parameters:\r\n                - Queue ID: Indicates the Queue ID\r\n  \
+        \              - Committed Information Rate (CIR): number of bits per second\r\
+        \n                - Committed Burst Size (CBS): number of bytes\r\n      \
+        \          - Excess Information Rate (EIR): number of bits per second\r\n\
+        \                - Excess Burst Size (EBS): number of bytes\r\n          \
+        \      - Coupling flag (CF): 0 or 1\r\n                - Color mode (CM):\
+        \ color-blind and color-aware."
       parameters:
       - name: "uuid"
         in: "path"
@@ -27962,23 +27364,24 @@ paths:
         type: "string"
       - name: "queue-id"
         in: "path"
-        description: "Id of queue-config-list"
+        description: "Id of cond-config-list"
         required: true
         type: "integer"
         format: "int32"
       responses:
         200:
-          description: "tapi.eth.QueueConfiguration"
+          description: "tapi.eth.TrafficConditioningConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.QueueConfiguration"
+            $ref: "#/definitions/tapi.eth.TrafficConditioningConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-term/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-conditioning/prio-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EthTerminationPac"
-      description: "none"
+      summary: "returns tapi.eth.PriorityConfiguration"
+      description: "This attribute indicates the Priority Splitter function for the\
+        \ mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue."
       parameters:
       - name: "uuid"
         in: "path"
@@ -28000,20 +27403,25 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "queue-id"
+        in: "path"
+        description: "Id of prio-config-list"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.eth.EthTerminationPac"
+          description: "tapi.eth.PriorityConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.EthTerminationPac"
+            $ref: "#/definitions/tapi.eth.PriorityConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/eth-term/priority-regenerate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-shaping/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.PriorityMapping"
-      description: "This attribute models the ETHx/ETH-m _A_Sk_MI_P_Regenerate information\
-        \ defined in G.8021."
+      summary: "returns tapi.eth.TrafficShapingPac"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -28037,17 +27445,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.eth.PriorityMapping"
+          description: "tapi.eth.TrafficShapingPac"
           schema:
-            $ref: "#/definitions/tapi.eth.PriorityMapping"
+            $ref: "#/definitions/tapi.eth.TrafficShapingPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/eth-connection-end-point-spec/ety-term/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-shaping/prio-config-list={queue-id}/
   : get:
       tags:
       - "tapi-eth"
-      summary: "returns tapi.eth.EtyTerminationPac"
-      description: "none"
+      summary: "returns tapi.eth.PriorityConfiguration"
+      description: "This attribute configures the Priority Splitter function for the\
+        \ mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue."
       parameters:
       - name: "uuid"
         in: "path"
@@ -28069,19 +27478,31 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "queue-id"
+        in: "path"
+        description: "Id of prio-config-list"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.eth.EtyTerminationPac"
+          description: "tapi.eth.PriorityConfiguration"
           schema:
-            $ref: "#/definitions/tapi.eth.EtyTerminationPac"
+            $ref: "#/definitions/tapi.eth.PriorityConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-assembly-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-ctp/traffic-shaping/queue-config-list={queue-id}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelAssemblySpec"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.QueueConfiguration"
+      description: "This attribute configures the Queue depth and Dropping threshold\
+        \ parameters of the Queue process. The Queue depth sets the maximum size of\
+        \ the queue in bytes. An incoming ETH_CI traffic unit is dropped if there\
+        \ is insufficient space in the queue to hold the whole unit. The Dropping\
+        \ threshold sets the threshold of the queue. If the queue is filled beyond\
+        \ this threshold, incoming ETH_CI traffic units accompanied by the ETH_CI_DE\
+        \ signal set are dropped."
       parameters:
       - name: "uuid"
         in: "path"
@@ -28103,18 +27524,24 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "queue-id"
+        in: "path"
+        description: "Id of queue-config-list"
+        required: true
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelAssemblySpec"
+          description: "tapi.eth.QueueConfiguration"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
+            $ref: "#/definitions/tapi.eth.QueueConfigurationWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-term/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EthTerminationPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28139,17 +27566,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+          description: "tapi.eth.EthTerminationPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.eth.EthTerminationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/eth-term/priority-regenerate/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelPropertiesPac"
-      description: "none"
+      - "tapi-eth"
+      summary: "returns tapi.eth.PriorityMapping"
+      description: "This attribute models the ETHx/ETH-m _A_Sk_MI_P_Regenerate information\
+        \ defined in G.8021."
       parameters:
       - name: "uuid"
         in: "path"
@@ -28173,16 +27601,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelPropertiesPac"
+          description: "tapi.eth.PriorityMapping"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+            $ref: "#/definitions/tapi.eth.PriorityMappingWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/measured-power-egress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-eth:eth-connection-end-point-spec/ety-term/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      - "tapi-eth"
+      summary: "returns tapi.eth.EtyTerminationPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28207,16 +27635,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
+          description: "tapi.eth.EtyTerminationPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.eth.EtyTerminationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/measured-power-ingress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.PowerPropertiesPac"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepMipList"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28241,16 +27669,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.PowerPropertiesPac"
+          description: "tapi.oam.MepMipList"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.oam.MepMipListWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/occupied-spectrum/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mep={meg-uuid},{mep-local-id}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MepRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28273,18 +27701,28 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
+      - name: "mep-local-id"
+        in: "path"
+        description: "Id of mep"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.oam.MepRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.oam.MepRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/media-channel-connection-end-point-spec/media-channel/occupied-spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-oam:mep-mip-list/mip={meg-uuid},{mip-local-id}/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      - "tapi-oam"
+      summary: "returns tapi.oam.MipRef"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28307,18 +27745,28 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
+      - name: "meg-uuid"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
+      - name: "mip-local-id"
+        in: "path"
+        description: "Id of mip"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.oam.MipRef"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.oam.MipRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepMipList"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28343,16 +27791,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepMipList"
+          description: "tapi.odu.OduConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.oam.MepMipList"
+            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mep={meg-uuid},{mep-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-common/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MepRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCommonPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28375,28 +27823,52 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
+      responses:
+        200:
+          description: "tapi.odu.OduCommonPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduCommonPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-ctp/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduCtpPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of topology"
         required: true
         type: "string"
-      - name: "mep-local-id"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of mep"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MepRef"
+          description: "tapi.odu.OduCtpPac"
           schema:
-            $ref: "#/definitions/tapi.oam.MepRef"
+            $ref: "#/definitions/tapi.odu.OduCtpPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/mep-mip-list/mip={meg-uuid},{mip-local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-protection/
   : get:
       tags:
-      - "tapi-oam"
-      summary: "returns tapi.oam.MipRef"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduProtectionPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28419,31 +27891,58 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "meg-uuid"
+      responses:
+        200:
+          description: "tapi.odu.OduProtectionPac"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduProtectionPacWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of topology"
         required: true
         type: "string"
-      - name: "mip-local-id"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of mip"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.oam.MipRef"
+          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
           schema:
-            $ref: "#/definitions/tapi.oam.MipRef"
+            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPayloadType"
+      description: "This attribute is applicable when the ODU CTP object instance\
+        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
+        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
+        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
+        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
+        \ G.709 with one additional value UN_INTERPRETABLE."
       parameters:
       - name: "uuid"
         in: "path"
@@ -28465,23 +27964,52 @@ paths:
         description: "Id of connection-end-point"
         required: true
         type: "string"
-      - name: "value-name"
+      responses:
+        200:
+          description: "tapi.odu.OduPayloadType"
+          schema:
+            $ref: "#/definitions/tapi.odu.OduPayloadTypeWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-odu:odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  : get:
+      tags:
+      - "tapi-odu"
+      summary: "returns tapi.odu.FecProperties"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of topology"
+        required: true
+        type: "string"
+      - name: "node-uuid"
+        in: "path"
+        description: "Id of node"
+        required: true
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
+      - name: "connection-end-point-uuid"
+        in: "path"
+        description: "Id of connection-end-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.odu.FecProperties"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.odu.FecPropertiesWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-assembly-spec/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduConnectionEndPointSpec"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelAssemblySpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28506,16 +28034,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduConnectionEndPointSpec"
+          description: "tapi.photonic.media.MediaChannelAssemblySpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-common/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCommonPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelConnectionEndPointSpec"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28540,16 +28068,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCommonPac"
+          description: "tapi.photonic.media.MediaChannelConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCommonPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-ctp/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduCtpPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelPropertiesPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28574,16 +28102,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduCtpPac"
+          description: "tapi.photonic.media.MediaChannelPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduCtpPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-protection/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/measured-power-egress/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduProtectionPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28608,16 +28136,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduProtectionPac"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduProtectionPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/measured-power-ingress/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduTerminationAndClientAdaptationPac"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.PowerPropertiesPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28642,22 +28170,17 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduTerminationAndClientAdaptationPac"
+          description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/accepted-payload-type/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/occupied-spectrum/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPayloadType"
-      description: "This attribute is applicable when the ODU CTP object instance\
-        \ represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j\
-        \ or ODUP/ODUj-21 adaptation function. \r\n                This attribute\
-        \ is a 2-digit Hex code that indicates the new accepted payload type.\r\n\
-        \                Valid values are defined in Table 15-8 of ITU-T Recommendation\
-        \ G.709 with one additional value UN_INTERPRETABLE."
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.SpectrumBand"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -28681,16 +28204,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.OduPayloadType"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPayloadType"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/odu-connection-end-point-spec/odu-term-and-adapter/fec-parameters/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:media-channel-connection-end-point-spec/media-channel/occupied-spectrum/frequency-constraint/
   : get:
       tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.FecProperties"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -28715,12 +28238,12 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.odu.FecProperties"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.odu.FecProperties"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28751,10 +28274,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28785,10 +28308,10 @@ paths:
         200:
           description: "tapi.photonic.media.MediaChannelPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/measured-power-egress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/measured-power-egress/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28819,10 +28342,10 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/measured-power-ingress/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/measured-power-ingress/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28853,10 +28376,10 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28887,10 +28410,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:ots-connection-end-point-spec/ots-media-channel/occupied-spectrum/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28921,10 +28444,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-assembly-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-assembly-connection-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28955,10 +28478,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-assembly-connection-end-point-spec/fec-parameters/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-assembly-connection-end-point-spec/fec-parameters/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -28989,10 +28512,10 @@ paths:
         200:
           description: "tapi.photonic.media.FecPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FecPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.FecPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-assembly-connection-end-point-spec/otsi-adapter/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-assembly-connection-end-point-spec/otsi-adapter/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29023,10 +28546,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiGserverAdaptationPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiGserverAdaptationPac"
+            $ref: "#/definitions/tapi.photonic.media.OtsiGserverAdaptationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29058,10 +28581,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiConnectionEndPointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
+            $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29092,10 +28615,10 @@ paths:
         200:
           description: "tapi.photonic.media.OtsiTerminationPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPac"
+            $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/laser-properties/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/laser-properties/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29126,10 +28649,10 @@ paths:
         200:
           description: "tapi.photonic.media.LaserPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.LaserPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.LaserPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/received-power/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/received-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29160,10 +28683,10 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-application-identifier/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-application-identifier/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29210,10 +28733,10 @@ paths:
         200:
           description: "tapi.photonic.media.ApplicationIdentifier"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
+            $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifierWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29244,10 +28767,10 @@ paths:
         200:
           description: "tapi.photonic.media.CentralFrequency"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+            $ref: "#/definitions/tapi.photonic.media.CentralFrequencyWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-central-frequency/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29278,10 +28801,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-spectrum/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-spectrum/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29312,10 +28835,10 @@ paths:
         200:
           description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/selected-spectrum/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/selected-spectrum/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29346,10 +28869,10 @@ paths:
         200:
           description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/otsi-connection-end-point-spec/otsi-termination/transmited-power/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-connectivity:cep-list/connection-end-point={connection-end-point-uuid}/tapi-photonic-media:otsi-connection-end-point-spec/otsi-termination/transmited-power/
   : get:
       tags:
       - "tapi-photonic-media"
@@ -29380,14 +28903,14 @@ paths:
         200:
           description: "tapi.photonic.media.PowerPropertiesPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+            $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/cep-list/connection-end-point={connection-end-point-uuid}/parent-node-edge-point/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-equipment:supporting-access-port/
   : get:
       tags:
-      - "tapi-connectivity"
-      summary: "returns tapi.topology.NodeEdgePointRef"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.SupportingAccessPort"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29405,26 +28928,19 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "connection-end-point-uuid"
-        in: "path"
-        description: "Id of connection-end-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.topology.NodeEdgePointRef"
+          description: "tapi.equipment.SupportingAccessPort"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.equipment.SupportingAccessPortWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-equipment:supporting-access-port/access-port/
   : get:
       tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.ServiceInterfacePointRef"
-      description: "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing)\
-        \ or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience)\
-        \ should be considered experimental"
+      - "tapi-equipment"
+      summary: "returns tapi.equipment.AccessPortRef"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
@@ -29441,25 +28957,20 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "service-interface-point-uuid"
-        in: "path"
-        description: "Id of mapped-service-interface-point"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePointRef"
+          description: "tapi.equipment.AccessPortRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.equipment.AccessPortRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-odu:odu-node-edge-point-spec/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelNodeEdgePointSpec"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduNodeEdgePointSpec"
       description: "Augments the base LayerProtocol information in NodeEdgePoint with\
-        \ OCH-specific information"
+        \ ODU-specific information"
       parameters:
       - name: "uuid"
         in: "path"
@@ -29478,16 +28989,16 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelNodeEdgePointSpec"
+          description: "tapi.odu.OduNodeEdgePointSpec"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
+            $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpecWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-odu:odu-node-edge-point-spec/odu-pool/
   : get:
       tags:
-      - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.MediaChannelPoolCapabilityPac"
+      - "tapi-odu"
+      summary: "returns tapi.odu.OduPoolPac"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29507,17 +29018,18 @@ paths:
         type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
+          description: "tapi.odu.OduPoolPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
+            $ref: "#/definitions/tapi.odu.OduPoolPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
-      description: "none"
+      summary: "returns tapi.photonic.media.MediaChannelNodeEdgePointSpec"
+      description: "Augments the base LayerProtocol information in NodeEdgePoint with\
+        \ OCH-specific information"
       parameters:
       - name: "uuid"
         in: "path"
@@ -29534,30 +29046,47 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      - name: "upper-frequency"
+      responses:
+        200:
+          description: "tapi.photonic.media.MediaChannelNodeEdgePointSpec"
+          schema:
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpecWrapper"
+        400:
+          description: "Internal error"
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/
+  : get:
+      tags:
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.MediaChannelPoolCapabilityPac"
+      description: "none"
+      parameters:
+      - name: "uuid"
         in: "path"
-        description: "Id of available-spectrum"
+        description: "Id of topology"
         required: true
-        type: "integer"
-        format: "int32"
-      - name: "lower-frequency"
+        type: "string"
+      - name: "node-uuid"
         in: "path"
-        description: "Id of available-spectrum"
+        description: "Id of node"
         required: true
-        type: "integer"
-        format: "int32"
+        type: "string"
+      - name: "owned-node-edge-point-uuid"
+        in: "path"
+        description: "Id of owned-node-edge-point"
+        required: true
+        type: "string"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.MediaChannelPoolCapabilityPac"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPacWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29589,16 +29118,16 @@ paths:
         format: "int32"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/available-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29618,28 +29147,28 @@ paths:
         type: "string"
       - name: "upper-frequency"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of available-spectrum"
         required: true
         type: "integer"
         format: "int32"
       - name: "lower-frequency"
         in: "path"
-        description: "Id of occupied-spectrum"
+        description: "Id of available-spectrum"
         required: true
         type: "integer"
         format: "int32"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29671,16 +29200,16 @@ paths:
         format: "int32"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/occupied-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.SpectrumBand"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29700,28 +29229,28 @@ paths:
         type: "string"
       - name: "upper-frequency"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of occupied-spectrum"
         required: true
         type: "integer"
         format: "int32"
       - name: "lower-frequency"
         in: "path"
-        description: "Id of supportable-spectrum"
+        description: "Id of occupied-spectrum"
         required: true
         type: "integer"
         format: "int32"
       responses:
         200:
-          description: "tapi.photonic.media.SpectrumBand"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/
   : get:
       tags:
       - "tapi-photonic-media"
-      summary: "returns tapi.photonic.media.FrequencyConstraint"
+      summary: "returns tapi.photonic.media.SpectrumBand"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29753,111 +29282,16 @@ paths:
         format: "int32"
       responses:
         200:
-          description: "tapi.photonic.media.FrequencyConstraint"
-          schema:
-            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
-  : get:
-      tags:
-      - "tapi-topology"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.common.NameAndValue"
-          schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/odu-node-edge-point-spec/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduNodeEdgePointSpec"
-      description: "Augments the base LayerProtocol information in NodeEdgePoint with\
-        \ ODU-specific information"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduNodeEdgePointSpec"
-          schema:
-            $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/odu-node-edge-point-spec/odu-pool/
-  : get:
-      tags:
-      - "tapi-odu"
-      summary: "returns tapi.odu.OduPoolPac"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
-        in: "path"
-        description: "Id of node"
-        required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
-        in: "path"
-        description: "Id of owned-node-edge-point"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "tapi.odu.OduPoolPac"
+          description: "tapi.photonic.media.SpectrumBand"
           schema:
-            $ref: "#/definitions/tapi.odu.OduPoolPac"
+            $ref: "#/definitions/tapi.photonic.media.SpectrumBandWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/supporting-access-port/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/tapi-photonic-media:media-channel-node-edge-point-spec/mc-pool/supportable-spectrum={upper-frequency},{lower-frequency}/frequency-constraint/
   : get:
       tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.SupportingAccessPort"
+      - "tapi-photonic-media"
+      summary: "returns tapi.photonic.media.FrequencyConstraint"
       description: "none"
       parameters:
       - name: "uuid"
@@ -29875,43 +29309,26 @@ paths:
         description: "Id of owned-node-edge-point"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.equipment.SupportingAccessPort"
-          schema:
-            $ref: "#/definitions/tapi.equipment.SupportingAccessPort"
-        400:
-          description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/supporting-access-port/access-port/
-  : get:
-      tags:
-      - "tapi-equipment"
-      summary: "returns tapi.equipment.AccessPortRef"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of topology"
-        required: true
-        type: "string"
-      - name: "node-uuid"
+      - name: "upper-frequency"
         in: "path"
-        description: "Id of node"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
-      - name: "owned-node-edge-point-uuid"
+        type: "integer"
+        format: "int32"
+      - name: "lower-frequency"
         in: "path"
-        description: "Id of owned-node-edge-point"
+        description: "Id of supportable-spectrum"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int32"
       responses:
         200:
-          description: "tapi.equipment.AccessPortRef"
+          description: "tapi.photonic.media.FrequencyConstraint"
           schema:
-            $ref: "#/definitions/tapi.equipment.AccessPortRef"
+            $ref: "#/definitions/tapi.photonic.media.FrequencyConstraintWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -29938,10 +29355,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -29967,10 +29384,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -29996,10 +29413,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -30025,10 +29442,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -30054,10 +29471,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -30083,10 +29500,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -30113,11 +29530,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/supporting-physical-span/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/tapi-equipment:supporting-physical-span/
+  : get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.equipment.SupportingPhysicalSpan"
@@ -30137,11 +29554,11 @@ paths:
         200:
           description: "tapi.equipment.SupportingPhysicalSpan"
           schema:
-            $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpan"
+            $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpanWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/supporting-physical-span/physical-span/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/tapi-equipment:supporting-physical-span/physical-span/
+  : get:
       tags:
       - "tapi-equipment"
       summary: "returns tapi.equipment.PhysicalSpanRef"
@@ -30161,10 +29578,10 @@ paths:
         200:
           description: "tapi.equipment.PhysicalSpanRef"
           schema:
-            $ref: "#/definitions/tapi.equipment.PhysicalSpanRef"
+            $ref: "#/definitions/tapi.equipment.PhysicalSpanRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -30186,11 +29603,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -30210,10 +29627,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -30234,10 +29651,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -30258,11 +29675,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -30282,10 +29699,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -30306,10 +29723,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -30331,10 +29748,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -30345,7 +29762,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkContext"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -30359,7 +29776,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -30378,7 +29795,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -30397,7 +29814,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -30409,7 +29826,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -30417,7 +29834,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -30433,7 +29850,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkService"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -30452,7 +29869,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -30476,7 +29893,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -30494,7 +29911,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -30502,7 +29919,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -30523,7 +29940,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -30548,7 +29965,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -30577,7 +29994,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -30601,7 +30018,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -30609,8 +30026,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.NameAndValue"
@@ -30637,7 +30054,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -30668,7 +30085,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -30704,8 +30121,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -30725,10 +30142,10 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/name/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/name/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -30747,7 +30164,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -30755,7 +30172,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -30778,7 +30195,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -30804,7 +30221,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -30835,7 +30252,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/schedule/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -30851,7 +30268,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -30870,7 +30287,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -30894,7 +30311,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -30918,7 +30335,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/state/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/state/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -30934,7 +30351,7 @@ paths:
         200:
           description: "tapi.common.AdminStatePac"
           schema:
-            $ref: "#/definitions/tapi.common.AdminStatePac"
+            $ref: "#/definitions/tapi.common.AdminStatePacWrapper"
         400:
           description: "Internal error"
     post:
@@ -30953,7 +30370,7 @@ paths:
         description: "tapi.common.AdminStatePac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.AdminStatePac"
+          $ref: "#/definitions/tapi.common.AdminStatePacWrapper"
       responses:
         201:
           description: "Object created"
@@ -30977,7 +30394,7 @@ paths:
         description: "tapi.common.AdminStatePac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.AdminStatePac"
+          $ref: "#/definitions/tapi.common.AdminStatePacWrapper"
       responses:
         201:
           description: "Object created"
@@ -31001,7 +30418,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/topology/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/topology/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -31017,10 +30434,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -31038,7 +30455,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -31046,7 +30463,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -31067,7 +30484,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkConstraint"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraintWrapper"
         400:
           description: "Internal error"
     put:
@@ -31092,7 +30509,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -31121,8 +30538,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic/
+  : post:
       tags:
       - "tapi-virtual-network"
       summary: "creates tapi.topology.CostCharacteristic"
@@ -31144,7 +30561,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -31152,8 +30569,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic={cost-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.topology.CostCharacteristic"
@@ -31179,7 +30596,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -31209,7 +30626,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -31244,7 +30661,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/diversity-exclusion={virtual-nw-service-uuid}/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/diversity-exclusion={virtual-nw-service-uuid}/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -31270,11 +30687,11 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNwServiceRef"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNwServiceRef"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNwServiceRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic/
+  : post:
       tags:
       - "tapi-virtual-network"
       summary: "creates tapi.topology.LatencyCharacteristic"
@@ -31296,7 +30713,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -31304,7 +30721,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -31331,7 +30748,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -31361,7 +30778,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -31396,8 +30813,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name/
+  : post:
       tags:
       - "tapi-virtual-network"
       summary: "creates tapi.common.NameAndValue"
@@ -31420,7 +30837,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -31428,8 +30845,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.NameAndValue"
@@ -31456,7 +30873,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -31487,7 +30904,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -31523,8 +30940,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.Capacity"
@@ -31544,7 +30961,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -31568,7 +30985,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -31597,7 +31014,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -31626,8 +31043,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.BandwidthProfile"
@@ -31647,7 +31064,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -31671,7 +31088,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -31700,7 +31117,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -31729,7 +31146,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -31750,7 +31167,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -31774,7 +31191,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -31803,7 +31220,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -31832,7 +31249,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -31853,7 +31270,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -31877,7 +31294,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -31906,7 +31323,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -31935,7 +31352,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -31956,7 +31373,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -31980,7 +31397,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -32009,7 +31426,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -32038,7 +31455,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -32059,7 +31476,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -32083,7 +31500,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -32112,7 +31529,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -32141,8 +31558,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/total-size/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.CapacityValue"
@@ -32163,7 +31580,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -32188,7 +31605,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -32218,7 +31635,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -32248,8 +31665,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/sink-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/sink-service-end-point/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -32269,11 +31686,11 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/src-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/src-service-end-point/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -32293,492 +31710,557 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  /operations/compute-p-2-p-path/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.ComputeP2PPath"
-      description: "operates on tapi.path.computation.ComputeP2PPath"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-common:get-service-interface-point-list/:
+    post:
+      tags:
+      - "tapi-common"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-common:update-service-interface-point/:
+    post:
+      tags:
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
+      parameters:
+      - in: "body"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-connectivity:create-connectivity-service/:
+    post:
+      tags:
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.CreateConnectivityService"
+      description: "operates on tapi.connectivity.CreateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
+              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
+            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/connect-to-stream/:
+  /operations/tapi-connectivity:delete-connectivity-service/:
     post:
       tags:
-      - "tapi-streaming"
-      summary: "operates on tapi.streaming.ConnectToStream"
-      description: "operates on tapi.streaming.ConnectToStream"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.DeleteConnectivityService"
+      description: "operates on tapi.connectivity.DeleteConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.streaming.connecttostream.Input.body-param"
+        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.streaming.connecttostream.Input"
+              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
       responses:
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-connectivity-service/:
+  /operations/tapi-connectivity:get-connection-details/:
     post:
       tags:
       - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.CreateConnectivityService"
-      description: "operates on tapi.connectivity.CreateConnectivityService"
+      summary: "operates on tapi.connectivity.GetConnectionDetails"
+      description: "operates on tapi.connectivity.GetConnectionDetails"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.createconnectivityservice.Input.body-param"
+        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.createconnectivityservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.CreateConnectivityService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-connectivity:get-connection-end-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-job/:
+  /operations/tapi-connectivity:get-connectivity-service-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamJob"
-      description: "operates on tapi.oam.CreateOamJob"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamjob.Input.body-param"
+        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamjob.Input"
+              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamJob"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service-end-point/:
+  /operations/tapi-connectivity:get-connectivity-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
-      description: "operates on tapi.oam.CreateOamServiceEndPoint"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
+      - "tapi-connectivity"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-oam-service/:
+  /operations/tapi-connectivity:update-connectivity-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.CreateOamService"
-      description: "operates on tapi.oam.CreateOamService"
+      - "tapi-connectivity"
+      summary: "operates on tapi.connectivity.UpdateConnectivityService"
+      description: "operates on tapi.connectivity.UpdateConnectivityService"
       parameters:
       - in: "body"
-        name: "tapi.oam.createoamservice.Input.body-param"
+        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.createoamservice.Input"
+              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.CreateOamService"
+            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/create-virtual-network-service/:
+  /operations/tapi-equipment:get-device-list/:
     post:
       tags:
-      - "tapi-virtual-network"
-      summary: "operates on tapi.virtual.network.CreateVirtualNetworkService"
-      description: "operates on tapi.virtual.network.CreateVirtualNetworkService"
-      parameters:
-      - in: "body"
-        name: "tapi.virtual.network.createvirtualnetworkservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.virtual.network.createvirtualnetworkservice.Input"
+      - "tapi-equipment"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.CreateVirtualNetworkService"
+            $ref: "#/definitions/tapi.equipment.GetDeviceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-connectivity-service/:
+  /operations/tapi-equipment:get-device/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.DeleteConnectivityService"
-      description: "operates on tapi.connectivity.DeleteConnectivityService"
+      - "tapi-equipment"
+      summary: "operates on tapi.equipment.GetDevice"
+      description: "operates on tapi.equipment.GetDevice"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.deleteconnectivityservice.Input.body-param"
+        name: "tapi.equipment.getdevice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.deleteconnectivityservice.Input"
+              $ref: "#/definitions/tapi.equipment.getdevice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.equipment.GetDevice"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-equipment:get-physical-span-list/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+      - "tapi-equipment"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.equipment.GetPhysicalSpanList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-job/:
+  /operations/tapi-equipment:get-physical-span/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamJob"
-      description: "operates on tapi.oam.DeleteOamJob"
+      - "tapi-equipment"
+      summary: "operates on tapi.equipment.GetPhysicalSpan"
+      description: "operates on tapi.equipment.GetPhysicalSpan"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamjob.Input.body-param"
+        name: "tapi.equipment.getphysicalspan.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
+              $ref: "#/definitions/tapi.equipment.getphysicalspan.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.equipment.GetPhysicalSpan"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service-end-point/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
-      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-oam-service/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.DeleteOamService"
-      description: "operates on tapi.oam.DeleteOamService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.oam.deleteoamservice.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-p-2-p-path/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.DeleteP2PPath"
-      description: "operates on tapi.path.computation.DeleteP2PPath"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationList"
+      description: "operates on tapi.notification.GetNotificationList"
       parameters:
       - in: "body"
-        name: "tapi.path.computation.deletep2ppath.Input.body-param"
+        name: "tapi.notification.getnotificationlist.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
+            $ref: "#/definitions/tapi.notification.GetNotificationList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-virtual-network-service/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
-      - "tapi-virtual-network"
-      summary: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
-      description: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.virtual.network.deletevirtualnetworkservice.Input.body-param"
+        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.virtual.network.deletevirtualnetworkservice.Input"
+              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.DeleteVirtualNetworkService"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-available-stream-connection-details/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
-      - "tapi-streaming"
+      - "tapi-notification"
       parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.streaming.GetAvailableStreamConnectionDetails"
+            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-details/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionDetails"
-      description: "operates on tapi.connectivity.GetConnectionDetails"
+      - "tapi-notification"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-notification:update-notification-subscription-service/:
+    post:
+      tags:
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectiondetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectiondetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connection-end-point-details/:
+  /operations/tapi-oam:create-oam-job/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectionEndPointDetails"
-      description: "operates on tapi.connectivity.GetConnectionEndPointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamJob"
+      description: "operates on tapi.oam.CreateOamJob"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectionendpointdetails.Input.body-param"
+        name: "tapi.oam.createoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectionendpointdetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectionEndPointDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-details/:
+  /operations/tapi-oam:create-oam-service-end-point/:
     post:
       tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.GetConnectivityServiceDetails"
-      description: "operates on tapi.connectivity.GetConnectivityServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamServiceEndPoint"
+      description: "operates on tapi.oam.CreateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.connectivity.getconnectivityservicedetails.Input.body-param"
+        name: "tapi.oam.createoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.connectivity.getconnectivityservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.createoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceDetails"
+            $ref: "#/definitions/tapi.oam.CreateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-connectivity-service-list/:
+  /operations/tapi-oam:create-oam-service/:
     post:
       tags:
-      - "tapi-connectivity"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.CreateOamService"
+      description: "operates on tapi.oam.CreateOamService"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.createoamservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.createoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.connectivity.GetConnectivityServiceList"
+            $ref: "#/definitions/tapi.oam.CreateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-device-list/:
+  /operations/tapi-oam:delete-oam-job/:
     post:
       tags:
-      - "tapi-equipment"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamJob"
+      description: "operates on tapi.oam.DeleteOamJob"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.deleteoamjob.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.deleteoamjob.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.equipment.GetDeviceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-device/:
+  /operations/tapi-oam:delete-oam-service-end-point/:
     post:
       tags:
-      - "tapi-equipment"
-      summary: "operates on tapi.equipment.GetDevice"
-      description: "operates on tapi.equipment.GetDevice"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamServiceEndPoint"
+      description: "operates on tapi.oam.DeleteOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.equipment.getdevice.Input.body-param"
+        name: "tapi.oam.deleteoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.equipment.getdevice.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamserviceendpoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.equipment.GetDevice"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-oam:delete-oam-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.DeleteOamService"
+      description: "operates on tapi.oam.DeleteOamService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.oam.deleteoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.oam.deleteoamservice.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-meg/:
+  /operations/tapi-oam:get-meg/:
     post:
       tags:
       - "tapi-oam"
@@ -32801,298 +32283,344 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-oam:get-oam-job/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetOamJob"
+      description: "operates on tapi.oam.GetOamJob"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.oam.getoamjob.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.oam.getoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.oam.GetOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-oam:get-oam-service-end-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetOamServiceEndPoint"
+      description: "operates on tapi.oam.GetOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.oam.getoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.oam.getoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.oam.GetOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-oam:get-oam-service-list/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationList"
-      description: "operates on tapi.notification.GetNotificationList"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.getnotificationlist.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.getnotificationlist.Input"
+      - "tapi-oam"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationList"
+            $ref: "#/definitions/tapi.oam.GetOamServiceList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-oam:get-oam-service/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
-      description: "operates on tapi.notification.GetNotificationSubscriptionServiceDetails"
+      - "tapi-oam"
+      summary: "operates on tapi.oam.GetOamService"
+      description: "operates on tapi.oam.GetOamService"
       parameters:
       - in: "body"
-        name: "tapi.notification.getnotificationsubscriptionservicedetails.Input.body-param"
+        name: "tapi.oam.getoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.getnotificationsubscriptionservicedetails.Input"
+              $ref: "#/definitions/tapi.oam.getoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceDetails"
+            $ref: "#/definitions/tapi.oam.GetOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-oam:update-oam-job/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-oam"
+      summary: "operates on tapi.oam.UpdateOamJob"
+      description: "operates on tapi.oam.UpdateOamJob"
+      parameters:
+      - in: "body"
+        name: "tapi.oam.updateoamjob.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetNotificationSubscriptionServiceList"
+            $ref: "#/definitions/tapi.oam.UpdateOamJob"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-job/:
+  /operations/tapi-oam:update-oam-service-end-point/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetOamJob"
-      description: "operates on tapi.oam.GetOamJob"
+      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
       parameters:
       - in: "body"
-        name: "tapi.oam.getoamjob.Input.body-param"
+        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getoamjob.Input"
+              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetOamJob"
+            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-end-point/:
+  /operations/tapi-oam:update-oam-service/:
     post:
       tags:
       - "tapi-oam"
-      summary: "operates on tapi.oam.GetOamServiceEndPoint"
-      description: "operates on tapi.oam.GetOamServiceEndPoint"
+      summary: "operates on tapi.oam.UpdateOamService"
+      description: "operates on tapi.oam.UpdateOamService"
       parameters:
       - in: "body"
-        name: "tapi.oam.getoamserviceendpoint.Input.body-param"
+        name: "tapi.oam.updateoamservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetOamServiceEndPoint"
+            $ref: "#/definitions/tapi.oam.UpdateOamService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service-list/:
+  /operations/tapi-path-computation:compute-p-2-p-path/:
     post:
       tags:
-      - "tapi-oam"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.ComputeP2PPath"
+      description: "operates on tapi.path.computation.ComputeP2PPath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.computep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.computep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetOamServiceList"
+            $ref: "#/definitions/tapi.path.computation.ComputeP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-oam-service/:
+  /operations/tapi-path-computation:delete-p-2-p-path/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.GetOamService"
-      description: "operates on tapi.oam.GetOamService"
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.DeleteP2PPath"
+      description: "operates on tapi.path.computation.DeleteP2PPath"
       parameters:
       - in: "body"
-        name: "tapi.oam.getoamservice.Input.body-param"
+        name: "tapi.path.computation.deletep2ppath.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.getoamservice.Input"
+              $ref: "#/definitions/tapi.path.computation.deletep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.GetOamService"
+            $ref: "#/definitions/tapi.path.computation.DeleteP2PPath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-physical-span-list/:
+  /operations/tapi-path-computation:optimize-p-2-ppath/:
     post:
       tags:
-      - "tapi-equipment"
-      parameters: []
+      - "tapi-path-computation"
+      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
+      description: "operates on tapi.path.computation.OptimizeP2Ppath"
+      parameters:
+      - in: "body"
+        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.equipment.GetPhysicalSpanList"
+            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-physical-span/:
+  /operations/tapi-streaming:connect-to-stream/:
     post:
       tags:
-      - "tapi-equipment"
-      summary: "operates on tapi.equipment.GetPhysicalSpan"
-      description: "operates on tapi.equipment.GetPhysicalSpan"
+      - "tapi-streaming"
+      summary: "operates on tapi.streaming.ConnectToStream"
+      description: "operates on tapi.streaming.ConnectToStream"
       parameters:
       - in: "body"
-        name: "tapi.equipment.getphysicalspan.Input.body-param"
+        name: "tapi.streaming.connecttostream.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.equipment.getphysicalspan.Input"
+              $ref: "#/definitions/tapi.streaming.connecttostream.Input"
+      responses:
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-streaming:get-available-stream-connection-details/:
+    post:
+      tags:
+      - "tapi-streaming"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.equipment.GetPhysicalSpan"
+            $ref: "#/definitions/tapi.streaming.GetAvailableStreamConnectionDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-streaming:get-supported-stream-connection-types/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+      - "tapi-streaming"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.streaming.GetSupportedStreamConnectionTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodedetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-stream-connection-types/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
-      - "tapi-streaming"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.streaming.GetSupportedStreamConnectionTypes"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
       - "tapi-topology"
@@ -33115,7 +32643,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
       - "tapi-topology"
@@ -33129,196 +32657,85 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-virtual-network-service-details/:
+  /operations/tapi-virtual-network:create-virtual-network-service/:
     post:
       tags:
       - "tapi-virtual-network"
-      summary: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
-      description: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
+      summary: "operates on tapi.virtual.network.CreateVirtualNetworkService"
+      description: "operates on tapi.virtual.network.CreateVirtualNetworkService"
       parameters:
       - in: "body"
-        name: "tapi.virtual.network.getvirtualnetworkservicedetails.Input.body-param"
+        name: "tapi.virtual.network.createvirtualnetworkservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.virtual.network.getvirtualnetworkservicedetails.Input"
+              $ref: "#/definitions/tapi.virtual.network.createvirtualnetworkservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceDetails"
+            $ref: "#/definitions/tapi.virtual.network.CreateVirtualNetworkService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-virtual-network-service-list/:
+  /operations/tapi-virtual-network:delete-virtual-network-service/:
     post:
       tags:
       - "tapi-virtual-network"
-      parameters: []
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceList"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/optimize-p-2-ppath/:
-    post:
-      tags:
-      - "tapi-path-computation"
-      summary: "operates on tapi.path.computation.OptimizeP2Ppath"
-      description: "operates on tapi.path.computation.OptimizeP2Ppath"
-      parameters:
-      - in: "body"
-        name: "tapi.path.computation.optimizep2ppath.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.path.computation.optimizep2ppath.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.path.computation.OptimizeP2Ppath"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/update-connectivity-service/:
-    post:
-      tags:
-      - "tapi-connectivity"
-      summary: "operates on tapi.connectivity.UpdateConnectivityService"
-      description: "operates on tapi.connectivity.UpdateConnectivityService"
-      parameters:
-      - in: "body"
-        name: "tapi.connectivity.updateconnectivityservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.connectivity.updateconnectivityservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.connectivity.UpdateConnectivityService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/update-notification-subscription-service/:
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/update-oam-job/:
-    post:
-      tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamJob"
-      description: "operates on tapi.oam.UpdateOamJob"
+      summary: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
+      description: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamjob.Input.body-param"
+        name: "tapi.virtual.network.deletevirtualnetworkservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamjob.Input"
+              $ref: "#/definitions/tapi.virtual.network.deletevirtualnetworkservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamJob"
+            $ref: "#/definitions/tapi.virtual.network.DeleteVirtualNetworkService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service-end-point/:
+  /operations/tapi-virtual-network:get-virtual-network-service-details/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamServiceEndPoint"
-      description: "operates on tapi.oam.UpdateOamServiceEndPoint"
+      - "tapi-virtual-network"
+      summary: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
+      description: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.oam.updateoamserviceendpoint.Input.body-param"
+        name: "tapi.virtual.network.getvirtualnetworkservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.oam.updateoamserviceendpoint.Input"
+              $ref: "#/definitions/tapi.virtual.network.getvirtualnetworkservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamServiceEndPoint"
+            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-oam-service/:
+  /operations/tapi-virtual-network:get-virtual-network-service-list/:
     post:
       tags:
-      - "tapi-oam"
-      summary: "operates on tapi.oam.UpdateOamService"
-      description: "operates on tapi.oam.UpdateOamService"
-      parameters:
-      - in: "body"
-        name: "tapi.oam.updateoamservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.oam.updateoamservice.Input"
+      - "tapi-virtual-network"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.oam.UpdateOamService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/update-service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
-      responses:
+            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceList"
         201:
           description: "No response"
         400:
@@ -33336,6 +32753,10 @@ definitions:
       administrative-state:
         description: "none"
         $ref: "#/definitions/tapi.common.AdministrativeState"
+  tapi.common.AdminStatePacWrapper:
+    properties:
+      state:
+        $ref: "#/definitions/tapi.common.AdminStatePac"
   tapi.common.AdministrativeState:
     type: "string"
     enum:
@@ -33374,6 +32795,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -33417,18 +32842,26 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
     - $ref: "#/definitions/tapi.connectivity.ContextAugmentation8"
-    - $ref: "#/definitions/tapi.equipment.ContextAugmentation6"
-    - $ref: "#/definitions/tapi.notification.ContextAugmentation3"
-    - $ref: "#/definitions/tapi.oam.ContextAugmentation4"
-    - $ref: "#/definitions/tapi.path.computation.ContextAugmentation7"
+    - $ref: "#/definitions/tapi.equipment.ContextAugmentation7"
+    - $ref: "#/definitions/tapi.notification.ContextAugmentation4"
+    - $ref: "#/definitions/tapi.oam.ContextAugmentation3"
+    - $ref: "#/definitions/tapi.path.computation.ContextAugmentation5"
     - $ref: "#/definitions/tapi.streaming.ContextAugmentation1"
     - $ref: "#/definitions/tapi.streaming.ContextAugmentation2"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation9"
-    - $ref: "#/definitions/tapi.virtual.network.ContextAugmentation5"
+    - $ref: "#/definitions/tapi.virtual.network.ContextAugmentation6"
     - type: "object"
       properties:
         service-interface-point:
@@ -33437,6 +32870,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
       description: "none"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.DirectiveValue:
     type: "string"
     enum:
@@ -33518,6 +32955,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -33578,6 +33019,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
   tapi.common.TerminationDirection:
     type: "string"
     enum:
@@ -33616,6 +33061,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.common.TimePeriod"
+  tapi.common.TimeIntervalWrapper:
+    properties:
+      elapsed-time:
+        $ref: "#/definitions/tapi.common.TimeInterval"
   tapi.common.TimePeriod:
     type: "object"
     properties:
@@ -33626,6 +33075,10 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.TimeUnit"
+  tapi.common.TimePeriodWrapper:
+    properties:
+      period:
+        $ref: "#/definitions/tapi.common.TimePeriod"
   tapi.common.TimeRange:
     type: "object"
     properties:
@@ -33635,6 +33088,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.TimeUnit:
     type: "string"
     enum:
@@ -33653,6 +33110,10 @@ definitions:
     - $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
     - $ref: "#/definitions/tapi.photonic.media.ServiceInterfacePointAugmentation1"
     - $ref: "#/definitions/tapi.photonic.media.ServiceInterfacePointAugmentation2"
+  tapi.common.context.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.context.ServiceInterfacePoint"
   tapi.common.getserviceinterfacepointdetails.Input:
     type: "object"
     properties:
@@ -33696,6 +33157,10 @@ definitions:
       connection-spec-reference:
         description: "The reference to the spec that defines the cep role."
         $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.CepRoleWrapper:
+    properties:
+      cep-role:
+        $ref: "#/definitions/tapi.connectivity.CepRole"
   tapi.connectivity.Connection:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -33804,6 +33269,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.ConnectionEndPointRefWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectionEndPointRef"
   tapi.connectivity.ConnectionRef:
     type: "object"
     properties:
@@ -33811,6 +33280,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectionRefWrapper:
+    properties:
+      lower-connection:
+        $ref: "#/definitions/tapi.connectivity.ConnectionRef"
   tapi.connectivity.ConnectionSpecReference:
     type: "object"
     properties:
@@ -33823,6 +33296,14 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.connectivity.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.connectivity.ConnectionSpecReference"
+  tapi.connectivity.ConnectionWrapper:
+    properties:
+      connection:
+        $ref: "#/definitions/tapi.connectivity.Connection"
   tapi.connectivity.ConnectivityConstraint:
     type: "object"
     properties:
@@ -33888,6 +33369,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.connectivity.Connection"
+  tapi.connectivity.ConnectivityContextWrapper:
+    properties:
+      tapi-connectivity:connectivity-context:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
   tapi.connectivity.ConnectivityServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -33953,6 +33438,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.ConnectivityServiceEndPointRefWrapper:
+    properties:
+      peer-fwd-connectivity-service-end-point:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPointRef"
   tapi.connectivity.ConnectivityServiceRef:
     type: "object"
     properties:
@@ -33960,6 +33449,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid"
+  tapi.connectivity.ConnectivityServiceRefWrapper:
+    properties:
+      coroute-inclusion:
+        $ref: "#/definitions/tapi.connectivity.ConnectivityServiceRef"
   tapi.connectivity.ContextAugmentation8:
     type: "object"
     properties:
@@ -34098,6 +33591,10 @@ definitions:
       description: "This object adds resilience and state attributes to the Route.\r\
         \n            When this object is not present, then the Route is intendend\
         \ as 'current' Route of the Connection."
+  tapi.connectivity.ResilienceRouteWrapper:
+    properties:
+      resilience-route-pac:
+        $ref: "#/definitions/tapi.connectivity.ResilienceRoute"
   tapi.connectivity.ReversionMode:
     type: "string"
     enum:
@@ -34130,6 +33627,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id"
       description: "none"
+  tapi.connectivity.RouteRefWrapper:
+    properties:
+      selected-route:
+        $ref: "#/definitions/tapi.connectivity.RouteRef"
+  tapi.connectivity.RouteWrapper:
+    properties:
+      route:
+        $ref: "#/definitions/tapi.connectivity.Route"
   tapi.connectivity.SelectionControl:
     type: "string"
     enum:
@@ -34235,6 +33740,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid"
       description: "none"
+  tapi.connectivity.SwitchControlRefWrapper:
+    properties:
+      sub-switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControlRef"
+  tapi.connectivity.SwitchControlWrapper:
+    properties:
+      switch-control:
+        $ref: "#/definitions/tapi.connectivity.SwitchControl"
+  tapi.connectivity.SwitchWrapper:
+    properties:
+      switch:
+        $ref: "#/definitions/tapi.connectivity.Switch"
   tapi.connectivity.UpdateConnectivityService:
     type: "object"
     properties:
@@ -34243,14 +33760,18 @@ definitions:
   tapi.connectivity.ceplist.ConnectionEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectionEndPoint"
-    - $ref: "#/definitions/tapi.eth.ConnectionEndPointAugmentation8"
+    - $ref: "#/definitions/tapi.eth.ConnectionEndPointAugmentation2"
     - $ref: "#/definitions/tapi.oam.ConnectionEndPointAugmentation1"
-    - $ref: "#/definitions/tapi.odu.ConnectionEndPointAugmentation2"
-    - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation3"
+    - $ref: "#/definitions/tapi.odu.ConnectionEndPointAugmentation3"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation4"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation5"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation6"
     - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation7"
+    - $ref: "#/definitions/tapi.photonic.media.ConnectionEndPointAugmentation8"
+  tapi.connectivity.ceplist.ConnectionEndPointWrapper:
+    properties:
+      connection-end-point:
+        $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
   tapi.connectivity.connectivitycontext.ConnectivityService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -34272,6 +33793,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ConnectionRef"
       description: "none"
+  tapi.connectivity.connectivitycontext.ConnectivityServiceWrapper:
+    properties:
+      connectivity-service:
+        $ref: "#/definitions/tapi.connectivity.connectivitycontext.ConnectivityService"
   tapi.connectivity.connectivityservice.EndPoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.ConnectivityServiceEndPoint"
@@ -34280,6 +33805,10 @@ definitions:
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation3"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation4"
     - $ref: "#/definitions/tapi.photonic.media.EndPointAugmentation5"
+  tapi.connectivity.connectivityservice.EndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.connectivity.connectivityservice.EndPoint"
   tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList:
     allOf:
     - type: "object"
@@ -34290,6 +33819,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.connectivity.ceplist.ConnectionEndPoint"
       description: "none"
+  tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepListWrapper:
+    properties:
+      tapi-connectivity:cep-list:
+        $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
   tapi.connectivity.createconnectivityservice.Input:
     type: "object"
     properties:
@@ -34559,6 +34092,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:physical-span/tapi-equipment:abstract-strand/tapi-equipment:local-id"
       description: "none"
+  tapi.equipment.AbstractStrandRefWrapper:
+    properties:
+      adjacent-strand:
+        $ref: "#/definitions/tapi.equipment.AbstractStrandRef"
+  tapi.equipment.AbstractStrandWrapper:
+    properties:
+      abstract-strand:
+        $ref: "#/definitions/tapi.equipment.AbstractStrand"
   tapi.equipment.AccessPort:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -34584,6 +34125,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:access-port/tapi-equipment:uuid"
       description: "none"
+  tapi.equipment.AccessPortRefWrapper:
+    properties:
+      access-port:
+        $ref: "#/definitions/tapi.equipment.AccessPortRef"
+  tapi.equipment.AccessPortWrapper:
+    properties:
+      access-port:
+        $ref: "#/definitions/tapi.equipment.AccessPort"
   tapi.equipment.ActualEquipment:
     type: "object"
     properties:
@@ -34598,12 +34147,20 @@ definitions:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ActualEquipmentWrapper:
+    properties:
+      actual-equipment:
+        $ref: "#/definitions/tapi.equipment.ActualEquipment"
   tapi.equipment.ActualHolder:
     type: "object"
     properties:
       common-holder-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+  tapi.equipment.ActualHolderWrapper:
+    properties:
+      actual-holder:
+        $ref: "#/definitions/tapi.equipment.ActualHolder"
   tapi.equipment.ActualNonFieldReplaceableModule:
     type: "object"
     properties:
@@ -34613,6 +34170,10 @@ definitions:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ActualNonFieldReplaceableModuleWrapper:
+    properties:
+      actual-non-field-replaceable-module:
+        $ref: "#/definitions/tapi.equipment.ActualNonFieldReplaceableModule"
   tapi.equipment.CommonActualProperties:
     type: "object"
     properties:
@@ -34638,6 +34199,10 @@ definitions:
         type: "string"
         description: "This attribute represents the asset identifier of this instance\
           \ from the manufacturer's perspective."
+  tapi.equipment.CommonActualPropertiesWrapper:
+    properties:
+      common-actual-properties:
+        $ref: "#/definitions/tapi.equipment.CommonActualProperties"
   tapi.equipment.CommonEquipmentProperties:
     type: "object"
     properties:
@@ -34663,6 +34228,10 @@ definitions:
         type: "string"
         description: "Represents the invariant properties of the equipment asset allocated\
           \ by the operator that define and characterize the type."
+  tapi.equipment.CommonEquipmentPropertiesWrapper:
+    properties:
+      common-equipment-properties:
+        $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
   tapi.equipment.CommonHolderProperties:
     type: "object"
     properties:
@@ -34679,6 +34248,10 @@ definitions:
       holder-category:
         type: "string"
         description: "The type of holder."
+  tapi.equipment.CommonHolderPropertiesWrapper:
+    properties:
+      common-holder-properties:
+        $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
   tapi.equipment.ConnectorPinAddress:
     type: "object"
     properties:
@@ -34703,7 +34276,11 @@ definitions:
           \ the connector.\r\n                Where the whole connector is used, then\
           \ individual Pins need not be identified.\r\n                Simple alternative\
           \ to pinAndRole."
-  tapi.equipment.ContextAugmentation6:
+  tapi.equipment.ConnectorPinAddressWrapper:
+    properties:
+      connector-pin:
+        $ref: "#/definitions/tapi.equipment.ConnectorPinAddress"
+  tapi.equipment.ContextAugmentation7:
     type: "object"
     properties:
       physical-context:
@@ -34736,6 +34313,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:uuid"
+  tapi.equipment.DeviceWrapper:
+    properties:
+      device:
+        $ref: "#/definitions/tapi.equipment.Device"
   tapi.equipment.Equipment:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -34784,6 +34365,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:equipment/tapi-equipment:uuid"
       description: "none"
+  tapi.equipment.EquipmentRefWrapper:
+    properties:
+      occupying-fru:
+        $ref: "#/definitions/tapi.equipment.EquipmentRef"
+  tapi.equipment.EquipmentWrapper:
+    properties:
+      equipment:
+        $ref: "#/definitions/tapi.equipment.Equipment"
   tapi.equipment.ExpectedEquipment:
     type: "object"
     properties:
@@ -34800,18 +34389,30 @@ definitions:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ExpectedEquipmentWrapper:
+    properties:
+      expected-equipment:
+        $ref: "#/definitions/tapi.equipment.ExpectedEquipment"
   tapi.equipment.ExpectedHolder:
     type: "object"
     properties:
       common-holder-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonHolderProperties"
+  tapi.equipment.ExpectedHolderWrapper:
+    properties:
+      expected-holder:
+        $ref: "#/definitions/tapi.equipment.ExpectedHolder"
   tapi.equipment.ExpectedNonFieldReplaceableModule:
     type: "object"
     properties:
       common-equipment-properties:
         description: "none"
         $ref: "#/definitions/tapi.equipment.CommonEquipmentProperties"
+  tapi.equipment.ExpectedNonFieldReplaceableModuleWrapper:
+    properties:
+      expected-non-field-replaceable-module:
+        $ref: "#/definitions/tapi.equipment.ExpectedNonFieldReplaceableModule"
   tapi.equipment.GetDevice:
     type: "object"
     properties:
@@ -34851,6 +34452,10 @@ definitions:
           $ref: "#/definitions/tapi.equipment.EquipmentRef"
       description: "Represents a space in an equipment in which another equipment\
         \ can be fitted in the field."
+  tapi.equipment.HolderWrapper:
+    properties:
+      contained-holder:
+        $ref: "#/definitions/tapi.equipment.Holder"
   tapi.equipment.NodeAugmentation1:
     type: "object"
     properties:
@@ -34860,7 +34465,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-equipment"
       namespace: "urn:onf:otcc:yang:tapi-equipment"
-  tapi.equipment.OwnedNodeEdgePointAugmentation1:
+  tapi.equipment.OwnedNodeEdgePointAugmentation3:
     type: "object"
     properties:
       supporting-access-port:
@@ -34885,6 +34490,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.equipment.PhysicalSpan"
       description: "none"
+  tapi.equipment.PhysicalContextWrapper:
+    properties:
+      tapi-equipment:physical-context:
+        $ref: "#/definitions/tapi.equipment.PhysicalContext"
   tapi.equipment.PhysicalSpan:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -34911,6 +34520,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:physical-span/tapi-equipment:uuid"
+  tapi.equipment.PhysicalSpanRefWrapper:
+    properties:
+      physical-span:
+        $ref: "#/definitions/tapi.equipment.PhysicalSpanRef"
+  tapi.equipment.PhysicalSpanWrapper:
+    properties:
+      physical-span:
+        $ref: "#/definitions/tapi.equipment.PhysicalSpan"
   tapi.equipment.PinAndRole:
     type: "object"
     properties:
@@ -34938,18 +34555,30 @@ definitions:
         description: "Where the pin has a distinct location identifier and a distinct\
           \ name this field can be used for the name.\r\n                For example:\r\
           \n                - locationInConnector = 6, pinName = GND"
+  tapi.equipment.PinAndRoleWrapper:
+    properties:
+      pin-and-role:
+        $ref: "#/definitions/tapi.equipment.PinAndRole"
   tapi.equipment.SupportingAccessPort:
     type: "object"
     properties:
       access-port:
         description: "none"
         $ref: "#/definitions/tapi.equipment.AccessPortRef"
+  tapi.equipment.SupportingAccessPortWrapper:
+    properties:
+      tapi-equipment:supporting-access-port:
+        $ref: "#/definitions/tapi.equipment.SupportingAccessPort"
   tapi.equipment.SupportingPhysicalSpan:
     type: "object"
     properties:
       physical-span:
         description: "none"
         $ref: "#/definitions/tapi.equipment.PhysicalSpanRef"
+  tapi.equipment.SupportingPhysicalSpanWrapper:
+    properties:
+      tapi-equipment:supporting-physical-span:
+        $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpan"
   tapi.equipment.getdevice.Input:
     type: "object"
     properties:
@@ -35022,12 +34651,16 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute returns the configured bandwidth"
+  tapi.eth.BandwidthReportWrapper:
+    properties:
+      bandwidth-report:
+        $ref: "#/definitions/tapi.eth.BandwidthReport"
   tapi.eth.ColourMode:
     type: "string"
     enum:
     - "COLOUR_BLIND"
     - "COLOUR_AWARE"
-  tapi.eth.ConnectionEndPointAugmentation8:
+  tapi.eth.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
       eth-connection-end-point-spec:
@@ -35180,6 +34813,10 @@ definitions:
         type: "boolean"
         description: "Reserved for future standardization."
         default: false
+  tapi.eth.ControlFrameFilterWrapper:
+    properties:
+      filter-config:
+        $ref: "#/definitions/tapi.eth.ControlFrameFilter"
   tapi.eth.CsfConfig:
     type: "string"
     enum:
@@ -35199,6 +34836,10 @@ definitions:
         description: "This attribute contains the near end clear threshold values\
           \ of the delay measurements."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.Eth1DmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-1-dm-threshold-data:
+        $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
   tapi.eth.Eth1LmThresholdData:
     type: "object"
     properties:
@@ -35212,6 +34853,10 @@ definitions:
           \ (see G.7710, section 10.1.7.2: Threshold reporting) and contains the near\
           \ end clear threshold values of the loss measurements."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.Eth1LmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-1-lm-threshold-data:
+        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
   tapi.eth.EthConnectionEndPointSpec:
     type: "object"
     properties:
@@ -35224,6 +34869,10 @@ definitions:
       eth-ctp:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthCtpPac"
+  tapi.eth.EthConnectionEndPointSpecWrapper:
+    properties:
+      tapi-eth:eth-connection-end-point-spec:
+        $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpec"
   tapi.eth.EthCtpPac:
     type: "object"
     properties:
@@ -35361,6 +35010,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.eth.EthCtpPacWrapper:
+    properties:
+      eth-ctp:
+        $ref: "#/definitions/tapi.eth.EthCtpPac"
   tapi.eth.EthDmThresholdData:
     type: "object"
     properties:
@@ -35388,6 +35041,10 @@ definitions:
         description: "This attribute contains the near end clear threshold values\
           \ of the delay measurements."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.EthDmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-dm-threshold-data:
+        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
   tapi.eth.EthLinkTraceJob:
     type: "object"
     properties:
@@ -35402,6 +35059,10 @@ definitions:
       eth-lt-msg:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
+  tapi.eth.EthLinkTraceJobWrapper:
+    properties:
+      tapi-eth:eth-link-trace-job:
+        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
   tapi.eth.EthLinkTraceResultData:
     type: "object"
     properties:
@@ -35413,6 +35074,10 @@ definitions:
           \ Mac Address, the TTL, and TLV."
         items:
           $ref: "#/definitions/tapi.eth.LinkTraceResult"
+  tapi.eth.EthLinkTraceResultDataWrapper:
+    properties:
+      tapi-eth:eth-link-trace-result-data:
+        $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
   tapi.eth.EthLmThresholdData:
     type: "object"
     properties:
@@ -35448,6 +35113,10 @@ definitions:
         description: "This attribute contains the near end cross threshold values\
           \ of the loss measurements."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.EthLmThresholdDataWrapper:
+    properties:
+      tapi-eth:eth-lm-threshold-data:
+        $ref: "#/definitions/tapi.eth.EthLmThresholdData"
   tapi.eth.EthLoopbackJob:
     type: "object"
     properties:
@@ -35459,6 +35128,10 @@ definitions:
       eth-lb-msg:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+  tapi.eth.EthLoopbackJobWrapper:
+    properties:
+      tapi-eth:eth-loopback-job:
+        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
   tapi.eth.EthLoopbackResultData:
     type: "object"
     properties:
@@ -35493,6 +35166,10 @@ definitions:
         format: "int32"
         description: "G.8052: This parameter returns the total number of received\
           \ LBR messages, including the out of order LBR frames."
+  tapi.eth.EthLoopbackResultDataWrapper:
+    properties:
+      tapi-eth:eth-loopback-result-data:
+        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
   tapi.eth.EthMegSpec:
     type: "object"
     properties:
@@ -35500,6 +35177,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.eth.EthMegSpecWrapper:
+    properties:
+      tapi-eth:eth-meg-spec:
+        $ref: "#/definitions/tapi.eth.EthMegSpec"
   tapi.eth.EthMepCommon:
     type: "object"
     properties:
@@ -35536,6 +35217,10 @@ definitions:
       mep-mac:
         type: "string"
         description: "This attribute contains the MAC Address of the MEP."
+  tapi.eth.EthMepCommonWrapper:
+    properties:
+      eth-mep-common:
+        $ref: "#/definitions/tapi.eth.EthMepCommon"
   tapi.eth.EthMepSink:
     type: "object"
     properties:
@@ -35599,6 +35284,10 @@ definitions:
         description: "This attribute defines the necessary number of transmitted frames\
           \ to enable the detection of 'bad seconds'. See also section 'Degraded signal\
           \ defect (dDEG)' in G.8021."
+  tapi.eth.EthMepSinkWrapper:
+    properties:
+      eth-mep-sink:
+        $ref: "#/definitions/tapi.eth.EthMepSink"
   tapi.eth.EthMepSource:
     type: "object"
     properties:
@@ -35625,6 +35314,10 @@ definitions:
         description: "This attribute specifies the priority of the APS messages.\r\
           \n                See section 8.1.5    APS insert process in G.8021."
         default: 7
+  tapi.eth.EthMepSourceWrapper:
+    properties:
+      eth-mep-source-pac:
+        $ref: "#/definitions/tapi.eth.EthMepSource"
   tapi.eth.EthMepSpec:
     type: "object"
     properties:
@@ -35637,6 +35330,10 @@ definitions:
       eth-mep-source-pac:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMepSource"
+  tapi.eth.EthMepSpecWrapper:
+    properties:
+      tapi-eth:eth-mep-spec:
+        $ref: "#/definitions/tapi.eth.EthMepSpec"
   tapi.eth.EthMipSpec:
     type: "object"
     properties:
@@ -35648,6 +35345,10 @@ definitions:
         description: "This attribute indicates whether the MIP is a full MIP (true)\
           \ or a down-half MIP (false)."
         default: false
+  tapi.eth.EthMipSpecWrapper:
+    properties:
+      tapi-eth:eth-mip-spec:
+        $ref: "#/definitions/tapi.eth.EthMipSpec"
   tapi.eth.EthOamMsgCommonPac:
     allOf:
     - $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
@@ -35680,6 +35381,10 @@ definitions:
             \ are encountered."
           default: false
       description: "none"
+  tapi.eth.EthOamMsgCommonPacWrapper:
+    properties:
+      eth-lb-msg:
+        $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
   tapi.eth.EthOamOperationCommonPac:
     type: "object"
     properties:
@@ -35693,6 +35398,10 @@ definitions:
         type: "string"
         description: "G.8052: This parameter provides the destination address, i.e.,\
           \ the MAC Address of the target MEP or MIP."
+  tapi.eth.EthOamOperationCommonPacWrapper:
+    properties:
+      eth-lt-msg:
+        $ref: "#/definitions/tapi.eth.EthOamOperationCommonPac"
   tapi.eth.EthOnDemand1DmPerformanceData:
     type: "object"
     properties:
@@ -35700,6 +35409,10 @@ definitions:
         description: "This attribute contains the results of an on-demand frame delay\
           \ measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+  tapi.eth.EthOnDemand1DmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-1-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
   tapi.eth.EthOnDemand1LmPerformanceData:
     type: "object"
     properties:
@@ -35707,6 +35420,10 @@ definitions:
         description: "This attribute contains the results of an on-demand synthetic\
           \ loss measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+  tapi.eth.EthOnDemand1LmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-1-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
   tapi.eth.EthOnDemand1wayMeasurementJob:
     type: "object"
     properties:
@@ -35716,12 +35433,20 @@ definitions:
       on-demand-control-1way-sink:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
+  tapi.eth.EthOnDemand1wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-on-demand-1way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
   tapi.eth.EthOnDemand2wayMeasurementJob:
     type: "object"
     properties:
       on-demand-control-2way-source:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
+  tapi.eth.EthOnDemand2wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-on-demand-2way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
   tapi.eth.EthOnDemandDmPerformanceData:
     type: "object"
     properties:
@@ -35733,6 +35458,10 @@ definitions:
         description: "This attribute contains the results of an on-demand frame delay\
           \ measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
+  tapi.eth.EthOnDemandDmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
   tapi.eth.EthOnDemandLmPerformanceData:
     type: "object"
     properties:
@@ -35744,6 +35473,10 @@ definitions:
         description: "This attribute contains the results of an on-demand synthetic\
           \ loss measurement job in the ingress direction."
         $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
+  tapi.eth.EthOnDemandLmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-on-demand-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
   tapi.eth.EthOnDemandMeasurementJobControlSink:
     type: "object"
     properties:
@@ -35769,6 +35502,10 @@ definitions:
           \ be unique at least within the context of any measurement type for the\
           \ MEG and initiating MEP.\r\n                range of type : 0..(2^32) -\
           \ 1"
+  tapi.eth.EthOnDemandMeasurementJobControlSinkWrapper:
+    properties:
+      on-demand-control-1way-sink:
+        $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSink"
   tapi.eth.EthOnDemandMeasurementJobControlSource:
     type: "object"
     properties:
@@ -35833,6 +35570,10 @@ definitions:
           \ intervals. Note that the value 0 means a degenerated measurement interval\
           \ with a single OAM message and the report is sent as immediately as possible.\r\
           \n                range of type : Non-negative"
+  tapi.eth.EthOnDemandMeasurementJobControlSourceWrapper:
+    properties:
+      on-demand-control-1way-source:
+        $ref: "#/definitions/tapi.eth.EthOnDemandMeasurementJobControlSource"
   tapi.eth.EthProActive1DmPerformanceData:
     type: "object"
     properties:
@@ -35840,6 +35581,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.EthProActive1DmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-1-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
   tapi.eth.EthProActive1LmPerformanceData:
     type: "object"
     properties:
@@ -35847,6 +35592,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.EthProActive1LmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-1-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
   tapi.eth.EthProActive1wayMeasurementJob:
     type: "object"
     properties:
@@ -35856,12 +35605,20 @@ definitions:
       pro-active-control-1way-sink:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
+  tapi.eth.EthProActive1wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-pro-active-1way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
   tapi.eth.EthProActive2wayMeasurementJob:
     type: "object"
     properties:
       pro-active-control-2way-source:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
+  tapi.eth.EthProActive2wayMeasurementJobWrapper:
+    properties:
+      tapi-eth:eth-pro-active-2way-measurement-job:
+        $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
   tapi.eth.EthProActiveDmPerformanceData:
     type: "object"
     properties:
@@ -35877,6 +35634,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
+  tapi.eth.EthProActiveDmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-dm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
   tapi.eth.EthProActiveLmPerformanceData:
     type: "object"
     properties:
@@ -35894,6 +35655,10 @@ definitions:
         description: "This attribute contains the statistical near end performnace\
           \ parameters."
         $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
+  tapi.eth.EthProActiveLmPerformanceDataWrapper:
+    properties:
+      tapi-eth:eth-pro-active-lm-performance-data:
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
   tapi.eth.EthProActiveMeasurementJobControlSink:
     type: "object"
     properties:
@@ -35918,6 +35683,10 @@ definitions:
         description: "This attribute identifies the state of the measurement job.\
           \ If set to TRUE, the MEP performs proactive Performance Measurement."
         default: true
+  tapi.eth.EthProActiveMeasurementJobControlSinkWrapper:
+    properties:
+      pro-active-control-1way-sink:
+        $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSink"
   tapi.eth.EthProActiveMeasurementJobControlSource:
     type: "object"
     properties:
@@ -35966,6 +35735,10 @@ definitions:
         description: "This attribute identifies the state of the measurement job.\
           \ If set to TRUE, the MEP performs proactive Performance Measurement."
         default: true
+  tapi.eth.EthProActiveMeasurementJobControlSourceWrapper:
+    properties:
+      pro-active-control-1way-source:
+        $ref: "#/definitions/tapi.eth.EthProActiveMeasurementJobControlSource"
   tapi.eth.EthTerminationPac:
     type: "object"
     properties:
@@ -36010,12 +35783,20 @@ definitions:
         description: "This attribute models the ETHx/ETH-m _A_Sk_MI_P_Regenerate information\
           \ defined in G.8021."
         $ref: "#/definitions/tapi.eth.PriorityMapping"
+  tapi.eth.EthTerminationPacWrapper:
+    properties:
+      eth-term:
+        $ref: "#/definitions/tapi.eth.EthTerminationPac"
   tapi.eth.EthTestJob:
     type: "object"
     properties:
       eth-test-msg:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOamMsgCommonPac"
+  tapi.eth.EthTestJobWrapper:
+    properties:
+      tapi-eth:eth-test-job:
+        $ref: "#/definitions/tapi.eth.EthTestJob"
   tapi.eth.EthTestResultData:
     type: "object"
     properties:
@@ -36024,6 +35805,10 @@ definitions:
         format: "int32"
         description: "G.8052: This parameter returns the total number of sent TST\
           \ frames."
+  tapi.eth.EthTestResultDataWrapper:
+    properties:
+      tapi-eth:eth-test-result-data:
+        $ref: "#/definitions/tapi.eth.EthTestResultData"
   tapi.eth.EtyPhyType:
     type: "string"
     enum:
@@ -36064,6 +35849,10 @@ definitions:
           \ be supported at the ETY trail termination. See IEEE 802.3 clause 30.3.2.1.3."
         items:
           $ref: "#/definitions/tapi.eth.EtyPhyType"
+  tapi.eth.EtyTerminationPacWrapper:
+    properties:
+      ety-term:
+        $ref: "#/definitions/tapi.eth.EtyTerminationPac"
   tapi.eth.FrameType:
     type: "string"
     enum:
@@ -36087,6 +35876,10 @@ definitions:
         type: "string"
         description: "G.8052: This attribute contains the source MAC Address of an\
           \ individual LTR frame result."
+  tapi.eth.LinkTraceResultWrapper:
+    properties:
+      result-list:
+        $ref: "#/definitions/tapi.eth.LinkTraceResult"
   tapi.eth.MegAugmentation1:
     type: "object"
     properties:
@@ -36096,7 +35889,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
-  tapi.eth.MepAugmentation2:
+  tapi.eth.MepAugmentation1:
     type: "object"
     properties:
       eth-mep-spec:
@@ -36113,7 +35906,7 @@ definitions:
     - "1S"
     - "10S"
     - "0"
-  tapi.eth.MipAugmentation2:
+  tapi.eth.MipAugmentation1:
     type: "object"
     properties:
       eth-mip-spec:
@@ -36125,63 +35918,63 @@ definitions:
   tapi.eth.OamJobAugmentation1:
     type: "object"
     properties:
-      eth-test-job:
+      eth-on-demand-2way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthTestJob"
+        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-2way-measurement-job:
+      eth-loopback-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-1way-measurement-job:
+      eth-pro-active-2way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation4:
     type: "object"
     properties:
-      eth-loopback-job:
+      eth-on-demand-1way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLoopbackJob"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation5:
     type: "object"
     properties:
-      eth-link-trace-job:
+      eth-pro-active-1way-measurement-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
+        $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation6:
     type: "object"
     properties:
-      eth-pro-active-2way-measurement-job:
+      eth-test-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthTestJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.OamJobAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1way-measurement-job:
+      eth-link-trace-job:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
+        $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -36227,6 +36020,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.eth.OnDemandDmPerformanceParametersWrapper:
+    properties:
+      on-demand-near-end-1-dm-parameters:
+        $ref: "#/definitions/tapi.eth.OnDemandDmPerformanceParameters"
   tapi.eth.OnDemandLmPerformanceParameters:
     type: "object"
     properties:
@@ -36243,6 +36040,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute contains the total number of frames lost."
+  tapi.eth.OnDemandLmPerformanceParametersWrapper:
+    properties:
+      on-demand-near-end-1-lm-parameters:
+        $ref: "#/definitions/tapi.eth.OnDemandLmPerformanceParameters"
   tapi.eth.PcpCoding:
     type: "string"
     enum:
@@ -36254,171 +36055,171 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation1:
     type: "object"
     properties:
-      eth-test-result-data:
+      eth-pro-active-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthTestResultData"
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation10:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      eth-on-demand-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation11:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      eth-pro-active-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation2:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      eth-pro-active-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      eth-loopback-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation4:
     type: "object"
     properties:
-      eth-link-trace-result-data:
+      eth-on-demand-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation5:
     type: "object"
     properties:
-      eth-loopback-result-data:
+      eth-link-trace-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
+        $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation6:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      eth-test-result-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthTestResultData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      eth-on-demand-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation8:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      eth-on-demand-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmCurrentDataAugmentation9:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      eth-pro-active-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation1:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      eth-on-demand-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      eth-pro-active-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation3:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      eth-pro-active-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation4:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      eth-on-demand-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation5:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      eth-pro-active-1-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation6:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      eth-on-demand-1-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      eth-pro-active-lm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmHistoryDataAugmentation8:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      eth-on-demand-dm-performance-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
+        $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -36434,18 +36235,18 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation2:
     type: "object"
     properties:
-      eth-dm-threshold-data:
+      eth-1-lm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
+        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
   tapi.eth.PmThresholdDataAugmentation3:
     type: "object"
     properties:
-      eth-1-lm-threshold-data:
+      eth-dm-threshold-data:
         description: "none"
-        $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
+        $ref: "#/definitions/tapi.eth.EthDmThresholdData"
     x-augmentation:
       prefix: "tapi-eth"
       namespace: "urn:onf:otcc:yang:tapi-eth"
@@ -36469,6 +36270,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.eth.PriorityConfigurationWrapper:
+    properties:
+      prio-config-list:
+        $ref: "#/definitions/tapi.eth.PriorityConfiguration"
   tapi.eth.PriorityMapping:
     type: "object"
     properties:
@@ -36519,6 +36324,10 @@ definitions:
         description: "This attribute defines the new priority value for the old priority\
           \ value 7."
         default: 7
+  tapi.eth.PriorityMappingWrapper:
+    properties:
+      priority-regenerate:
+        $ref: "#/definitions/tapi.eth.PriorityMapping"
   tapi.eth.QueueConfiguration:
     type: "object"
     properties:
@@ -36534,6 +36343,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute defines the depth of the queue in bytes."
+  tapi.eth.QueueConfigurationWrapper:
+    properties:
+      queue-config-list:
+        $ref: "#/definitions/tapi.eth.QueueConfiguration"
   tapi.eth.RepetitionPeriod:
     type: "string"
     enum:
@@ -36577,6 +36390,10 @@ definitions:
         format: "int32"
         description: "This attribute contains the average frame delay variation measured\
           \ in units of ns (nano second, 1x10e-9 seconds)."
+  tapi.eth.StatisticalDmPerformanceParametersWrapper:
+    properties:
+      pro-active-near-end-1-dm-parameters:
+        $ref: "#/definitions/tapi.eth.StatisticalDmPerformanceParameters"
   tapi.eth.StatisticalLmPerformanceParameters:
     type: "object"
     properties:
@@ -36607,6 +36424,10 @@ definitions:
         description: "This attribute contains the minimum frame loss ratio calculated\
           \ over a period of time.\r\n                The accuracy of the value is\
           \ for further study."
+  tapi.eth.StatisticalLmPerformanceParametersWrapper:
+    properties:
+      pro-active-near-end-1-lm-parameters:
+        $ref: "#/definitions/tapi.eth.StatisticalLmPerformanceParameters"
   tapi.eth.TrafficConditioningConfiguration:
     type: "object"
     properties:
@@ -36637,6 +36458,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "This attribute indicates the Excess Information Rate in bits/s."
+  tapi.eth.TrafficConditioningConfigurationWrapper:
+    properties:
+      cond-config-list:
+        $ref: "#/definitions/tapi.eth.TrafficConditioningConfiguration"
   tapi.eth.TrafficConditioningPac:
     type: "object"
     properties:
@@ -36667,6 +36492,10 @@ definitions:
           \ color-blind and color-aware."
         items:
           $ref: "#/definitions/tapi.eth.TrafficConditioningConfiguration"
+  tapi.eth.TrafficConditioningPacWrapper:
+    properties:
+      traffic-conditioning:
+        $ref: "#/definitions/tapi.eth.TrafficConditioningPac"
   tapi.eth.TrafficShapingPac:
     type: "object"
     properties:
@@ -36706,6 +36535,10 @@ definitions:
           \ queue."
         items:
           $ref: "#/definitions/tapi.eth.PriorityConfiguration"
+  tapi.eth.TrafficShapingPacWrapper:
+    properties:
+      traffic-shaping:
+        $ref: "#/definitions/tapi.eth.TrafficShapingPac"
   tapi.eth.VlanType:
     type: "string"
     enum:
@@ -36728,7 +36561,11 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
-  tapi.notification.ContextAugmentation3:
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
+  tapi.notification.ContextAugmentation4:
     type: "object"
     properties:
       notification-context:
@@ -36779,6 +36616,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -36851,6 +36692,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -36864,6 +36709,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -36894,6 +36743,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -36902,6 +36755,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -36990,6 +36847,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -37022,6 +36883,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -37137,7 +37002,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-oam"
       namespace: "urn:onf:otcc:yang:tapi-oam"
-  tapi.oam.ContextAugmentation4:
+  tapi.oam.ContextAugmentation3:
     type: "object"
     properties:
       oam-context:
@@ -37226,6 +37091,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid"
+  tapi.oam.MegRefWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.MegRef"
   tapi.oam.Mep:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -37260,6 +37129,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.oam.MepRef"
+  tapi.oam.MepMipListWrapper:
+    properties:
+      tapi-oam:mep-mip-list:
+        $ref: "#/definitions/tapi.oam.MepMipList"
   tapi.oam.MepRef:
     allOf:
     - $ref: "#/definitions/tapi.oam.MegRef"
@@ -37270,6 +37143,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MepRefWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.MepRef"
   tapi.oam.Mip:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -37289,6 +37166,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id"
       description: "none"
+  tapi.oam.MipRefWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.MipRef"
   tapi.oam.OamConstraint:
     type: "object"
     properties:
@@ -37358,6 +37239,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid"
+  tapi.oam.OamProfileRefWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.OamProfileRef"
   tapi.oam.OamService:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -37426,6 +37311,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id"
       description: "none"
+  tapi.oam.OamServiceEndPointRefWrapper:
+    properties:
+      oam-service-end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPointRef"
+  tapi.oam.OamServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
   tapi.oam.OamServiceRef:
     type: "object"
     properties:
@@ -37433,6 +37326,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid"
+  tapi.oam.OamServiceWrapper:
+    properties:
+      oam-service:
+        $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.PmBinData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -37442,6 +37339,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.TimePeriod"
       description: "none"
+  tapi.oam.PmBinDataWrapper:
+    properties:
+      pm-bin-data:
+        $ref: "#/definitions/tapi.oam.PmBinData"
   tapi.oam.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -37551,6 +37452,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.oam.oamcontext.Meg"
       description: "Augments the base TAPI Context with OamService information"
+  tapi.oam.context.OamContextWrapper:
+    properties:
+      tapi-oam:oam-context:
+        $ref: "#/definitions/tapi.oam.context.OamContext"
   tapi.oam.createoamjob.Input:
     type: "object"
     properties:
@@ -37714,14 +37619,22 @@ definitions:
           $ref: "#/definitions/tapi.oam.OamService"
   tapi.oam.meg.Mep:
     allOf:
-    - $ref: "#/definitions/tapi.eth.MepAugmentation2"
+    - $ref: "#/definitions/tapi.eth.MepAugmentation1"
     - $ref: "#/definitions/tapi.oam.Mep"
-    - $ref: "#/definitions/tapi.odu.MepAugmentation1"
+    - $ref: "#/definitions/tapi.odu.MepAugmentation2"
+  tapi.oam.meg.MepWrapper:
+    properties:
+      mep:
+        $ref: "#/definitions/tapi.oam.meg.Mep"
   tapi.oam.meg.Mip:
     allOf:
-    - $ref: "#/definitions/tapi.eth.MipAugmentation2"
+    - $ref: "#/definitions/tapi.eth.MipAugmentation1"
     - $ref: "#/definitions/tapi.oam.Mip"
-    - $ref: "#/definitions/tapi.odu.MipAugmentation1"
+    - $ref: "#/definitions/tapi.odu.MipAugmentation2"
+  tapi.oam.meg.MipWrapper:
+    properties:
+      mip:
+        $ref: "#/definitions/tapi.oam.meg.Mip"
   tapi.oam.oamcontext.Meg:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -37756,6 +37669,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "none"
+  tapi.oam.oamcontext.MegWrapper:
+    properties:
+      meg:
+        $ref: "#/definitions/tapi.oam.oamcontext.Meg"
   tapi.oam.oamcontext.OamJob:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -37796,6 +37713,10 @@ definitions:
           type: "string"
           description: "none"
       description: "none"
+  tapi.oam.oamcontext.OamJobWrapper:
+    properties:
+      oam-job:
+        $ref: "#/definitions/tapi.oam.oamcontext.OamJob"
   tapi.oam.oamcontext.OamProfile:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -37812,6 +37733,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.oam.PmBinData"
       description: "none"
+  tapi.oam.oamcontext.OamProfileWrapper:
+    properties:
+      oam-profile:
+        $ref: "#/definitions/tapi.oam.oamcontext.OamProfile"
   tapi.oam.oamjob.PmCurrentData:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -37866,6 +37791,10 @@ definitions:
         \ example, typically at least\r\n                one 15min and\r\n       \
         \         one 24hr;\r\n                optionally one additional configurable\
         \ (< 15min)"
+  tapi.oam.oamjob.PmCurrentDataWrapper:
+    properties:
+      pm-current-data:
+        $ref: "#/definitions/tapi.oam.oamjob.PmCurrentData"
   tapi.oam.oamprofile.PmThresholdData:
     allOf:
     - $ref: "#/definitions/tapi.eth.PmThresholdDataAugmentation1"
@@ -37873,6 +37802,10 @@ definitions:
     - $ref: "#/definitions/tapi.eth.PmThresholdDataAugmentation3"
     - $ref: "#/definitions/tapi.eth.PmThresholdDataAugmentation4"
     - $ref: "#/definitions/tapi.oam.PmThresholdData"
+  tapi.oam.oamprofile.PmThresholdDataWrapper:
+    properties:
+      pm-threshold-data:
+        $ref: "#/definitions/tapi.oam.oamprofile.PmThresholdData"
   tapi.oam.pmcurrentdata.PmHistoryData:
     allOf:
     - $ref: "#/definitions/tapi.eth.PmHistoryDataAugmentation1"
@@ -37884,6 +37817,10 @@ definitions:
     - $ref: "#/definitions/tapi.eth.PmHistoryDataAugmentation7"
     - $ref: "#/definitions/tapi.eth.PmHistoryDataAugmentation8"
     - $ref: "#/definitions/tapi.oam.PmHistoryData"
+  tapi.oam.pmcurrentdata.PmHistoryDataWrapper:
+    properties:
+      pm-history-data:
+        $ref: "#/definitions/tapi.oam.pmcurrentdata.PmHistoryData"
   tapi.oam.updateoamjob.Input:
     type: "object"
     properties:
@@ -37946,7 +37883,7 @@ definitions:
       end-point:
         description: "none"
         $ref: "#/definitions/tapi.oam.OamServiceEndPoint"
-  tapi.odu.ConnectionEndPointAugmentation2:
+  tapi.odu.ConnectionEndPointAugmentation3:
     type: "object"
     properties:
       odu-connection-end-point-spec:
@@ -37973,6 +37910,10 @@ definitions:
     enum:
     - "PERCENTAGE"
     - "NUMBER_ERRORED_BLOCKS"
+  tapi.odu.DegThrWrapper:
+    properties:
+      deg-thr:
+        $ref: "#/definitions/tapi.odu.DegThr"
   tapi.odu.EndPointAugmentation1:
     type: "object"
     properties:
@@ -38009,6 +37950,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "counter: bit error rate after correction by FEC"
+  tapi.odu.FecPropertiesWrapper:
+    properties:
+      fec-parameters:
+        $ref: "#/definitions/tapi.odu.FecProperties"
   tapi.odu.MappingType:
     type: "string"
     enum:
@@ -38018,7 +37963,7 @@ definitions:
     - "GMP"
     - "TTP_GFP_BMP"
     - "NULL"
-  tapi.odu.MepAugmentation1:
+  tapi.odu.MepAugmentation2:
     type: "object"
     properties:
       odu-connection-end-point-spec:
@@ -38027,7 +37972,7 @@ definitions:
     x-augmentation:
       prefix: "tapi-odu"
       namespace: "urn:onf:otcc:yang:tapi-odu"
-  tapi.odu.MipAugmentation1:
+  tapi.odu.MipAugmentation2:
     type: "object"
     properties:
       odu-mip-spec:
@@ -38070,6 +38015,10 @@ definitions:
       odu-type:
         type: "string"
         description: "This attribute specifies the type of the ODU termination point."
+  tapi.odu.OduCommonPacWrapper:
+    properties:
+      odu-common:
+        $ref: "#/definitions/tapi.odu.OduCommonPac"
   tapi.odu.OduConnectionEndPointSpec:
     type: "object"
     properties:
@@ -38085,6 +38034,10 @@ definitions:
       odu-protection:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduProtectionPac"
+  tapi.odu.OduConnectionEndPointSpecWrapper:
+    properties:
+      tapi-odu:odu-connection-end-point-spec:
+        $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
   tapi.odu.OduConnectivityServiceEndPointSpec:
     type: "object"
     properties:
@@ -38097,6 +38050,10 @@ definitions:
       odu-csep-ttp-pac:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
+  tapi.odu.OduConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-odu:odu-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
   tapi.odu.OduCsepCommonPac:
     type: "object"
     properties:
@@ -38129,6 +38086,10 @@ definitions:
       odu-type:
         type: "string"
         description: "This attribute specifies the type of the ODU termination point."
+  tapi.odu.OduCsepCommonPacWrapper:
+    properties:
+      odu-csep-common-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepCommonPac"
   tapi.odu.OduCsepCtpPac:
     type: "object"
     properties:
@@ -38189,6 +38150,10 @@ definitions:
           \n                In case of ODUk mapping over ODUCn, the TPN is encoded\
           \ in a 14-bit field so the value range is 0-16383. See clause 20.4.1.1/G.709-2016.\r\
           \n                "
+  tapi.odu.OduCsepCtpPacWrapper:
+    properties:
+      odu-csep-ctp-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepCtpPac"
   tapi.odu.OduCsepTtpPac:
     type: "object"
     properties:
@@ -38199,6 +38164,10 @@ definitions:
         type: "string"
         description: "This attribute configures the type of the client CTP of the\
           \ server ODU TTP."
+  tapi.odu.OduCsepTtpPacWrapper:
+    properties:
+      odu-csep-ttp-pac:
+        $ref: "#/definitions/tapi.odu.OduCsepTtpPac"
   tapi.odu.OduCtpPac:
     type: "object"
     properties:
@@ -38267,6 +38236,10 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.odu.OduCtpPacWrapper:
+    properties:
+      odu-ctp:
+        $ref: "#/definitions/tapi.odu.OduCtpPac"
   tapi.odu.OduDefectPac:
     type: "object"
     properties:
@@ -38294,6 +38267,10 @@ definitions:
         type: "boolean"
         description: "Trail Trace Identifier Mismatch"
         default: false
+  tapi.odu.OduDefectPacWrapper:
+    properties:
+      odu-defect:
+        $ref: "#/definitions/tapi.odu.OduDefectPac"
   tapi.odu.OduMipPac:
     type: "object"
     properties:
@@ -38339,6 +38316,10 @@ definitions:
           \ system to enable or disable the Consequent Action function when detecting\
           \ Trace Identifier Mismatch (TIM) at the trail termination sink."
         default: true
+  tapi.odu.OduMipPacWrapper:
+    properties:
+      odu-mip:
+        $ref: "#/definitions/tapi.odu.OduMipPac"
   tapi.odu.OduMipSpec:
     type: "object"
     properties:
@@ -38357,6 +38338,10 @@ definitions:
       odu-defect:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduDefectPac"
+  tapi.odu.OduMipSpecWrapper:
+    properties:
+      tapi-odu:odu-mip-spec:
+        $ref: "#/definitions/tapi.odu.OduMipSpec"
   tapi.odu.OduNamedPayloadType:
     type: "string"
     enum:
@@ -38371,12 +38356,20 @@ definitions:
         items:
           type: "integer"
           format: "int32"
+  tapi.odu.OduNcmPacWrapper:
+    properties:
+      odu-ncm:
+        $ref: "#/definitions/tapi.odu.OduNcmPac"
   tapi.odu.OduNodeEdgePointSpec:
     type: "object"
     properties:
       odu-pool:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduPoolPac"
+  tapi.odu.OduNodeEdgePointSpecWrapper:
+    properties:
+      tapi-odu:odu-node-edge-point-spec:
+        $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
   tapi.odu.OduPayloadType:
     type: "object"
     properties:
@@ -38387,6 +38380,10 @@ definitions:
       named-payload-type:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduNamedPayloadType"
+  tapi.odu.OduPayloadTypeWrapper:
+    properties:
+      accepted-payload-type:
+        $ref: "#/definitions/tapi.odu.OduPayloadType"
   tapi.odu.OduPmPac:
     type: "object"
     properties:
@@ -38409,6 +38406,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "Near-end Severely Errored Second"
+  tapi.odu.OduPmPacWrapper:
+    properties:
+      odu-pm:
+        $ref: "#/definitions/tapi.odu.OduPmPac"
   tapi.odu.OduPoolPac:
     type: "object"
     properties:
@@ -38424,6 +38425,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.odu.OduPoolPacWrapper:
+    properties:
+      odu-pool:
+        $ref: "#/definitions/tapi.odu.OduPoolPac"
   tapi.odu.OduProtectionPac:
     type: "object"
     properties:
@@ -38443,6 +38448,10 @@ definitions:
           \ triggers the MI_APS_LVL signal to the transport adaptation function. The\
           \ value 0 means path and the values 1 through 6 mean TCM level 1 through\
           \ 6 respectively."
+  tapi.odu.OduProtectionPacWrapper:
+    properties:
+      odu-protection:
+        $ref: "#/definitions/tapi.odu.OduProtectionPac"
   tapi.odu.OduSlotSize:
     type: "string"
     enum:
@@ -38456,6 +38465,10 @@ definitions:
         format: "int32"
         description: "This attribute indicates the tandem connection monitoring field\
           \ of the ODU OH."
+  tapi.odu.OduTcmMipPacWrapper:
+    properties:
+      odu-tcm:
+        $ref: "#/definitions/tapi.odu.OduTcmMipPac"
   tapi.odu.OduTerminationAndClientAdaptationPac:
     type: "object"
     properties:
@@ -38503,7 +38516,11 @@ definitions:
         type: "string"
         description: "This attribute configures the type of the client CTP of the\
           \ server ODU TTP."
-  tapi.odu.OwnedNodeEdgePointAugmentation2:
+  tapi.odu.OduTerminationAndClientAdaptationPacWrapper:
+    properties:
+      odu-term-and-adapter:
+        $ref: "#/definitions/tapi.odu.OduTerminationAndClientAdaptationPac"
+  tapi.odu.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
       odu-node-edge-point-spec:
@@ -38546,12 +38563,16 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.odu.UasChoiceWrapper:
+    properties:
+      uas:
+        $ref: "#/definitions/tapi.odu.UasChoice"
   tapi.path.computation.ComputeP2PPath:
     type: "object"
     properties:
       output:
         $ref: "#/definitions/tapi.path.computation.computep2ppath.Output"
-  tapi.path.computation.ContextAugmentation7:
+  tapi.path.computation.ContextAugmentation5:
     type: "object"
     properties:
       path-computation-context:
@@ -38614,6 +38635,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.path.computation.Path"
+  tapi.path.computation.PathComputationContextWrapper:
+    properties:
+      tapi-path-computation:path-computation-context:
+        $ref: "#/definitions/tapi.path.computation.PathComputationContext"
   tapi.path.computation.PathComputationService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -38642,6 +38667,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
       description: "none"
+  tapi.path.computation.PathComputationServiceWrapper:
+    properties:
+      path-comp-service:
+        $ref: "#/definitions/tapi.path.computation.PathComputationService"
   tapi.path.computation.PathObjectiveFunction:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -38663,6 +38692,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathObjectiveFunctionWrapper:
+    properties:
+      objective-function:
+        $ref: "#/definitions/tapi.path.computation.PathObjectiveFunction"
   tapi.path.computation.PathOptimizationConstraint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -38672,6 +38705,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.common.DirectiveValue"
       description: "none"
+  tapi.path.computation.PathOptimizationConstraintWrapper:
+    properties:
+      optimization-constraint:
+        $ref: "#/definitions/tapi.path.computation.PathOptimizationConstraint"
   tapi.path.computation.PathRef:
     type: "object"
     properties:
@@ -38679,6 +38716,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid"
+  tapi.path.computation.PathRefWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.PathRef"
   tapi.path.computation.PathServiceEndPoint:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -38715,6 +38756,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.path.computation.PathServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.path.computation.PathServiceEndPoint"
+  tapi.path.computation.PathWrapper:
+    properties:
+      path:
+        $ref: "#/definitions/tapi.path.computation.Path"
   tapi.path.computation.RouteObjectiveFunction:
     type: "string"
     enum:
@@ -38767,6 +38816,10 @@ definitions:
       route-direction:
         description: "none"
         $ref: "#/definitions/tapi.common.ForwardingDirection"
+  tapi.path.computation.RoutingConstraintWrapper:
+    properties:
+      routing-constraint:
+        $ref: "#/definitions/tapi.path.computation.RoutingConstraint"
   tapi.path.computation.TopologyConstraint:
     type: "object"
     properties:
@@ -38819,6 +38872,10 @@ definitions:
         description: "none"
         items:
           type: "string"
+  tapi.path.computation.TopologyConstraintWrapper:
+    properties:
+      topology-constraint:
+        $ref: "#/definitions/tapi.path.computation.TopologyConstraint"
   tapi.path.computation.ValueOrPriority:
     type: "object"
     properties:
@@ -38830,6 +38887,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.path.computation.ValueOrPriorityWrapper:
+    properties:
+      max-allowed-cost:
+        $ref: "#/definitions/tapi.path.computation.ValueOrPriority"
   tapi.path.computation.computep2ppath.Input:
     type: "object"
     properties:
@@ -38915,6 +38976,10 @@ definitions:
     - "ITUT_G698_2"
     - "ITUT_G696_1"
     - "ITUT_G695"
+  tapi.photonic.media.ApplicationIdentifierWrapper:
+    properties:
+      supportable-application-identifier:
+        $ref: "#/definitions/tapi.photonic.media.ApplicationIdentifier"
   tapi.photonic.media.CentralFrequency:
     type: "object"
     properties:
@@ -38926,6 +38991,32 @@ definitions:
       frequency-constraint:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+  tapi.photonic.media.CentralFrequencyBand:
+    type: "object"
+    properties:
+      upper-central-frequency:
+        type: "integer"
+        format: "int32"
+        description: "The upper central frequency that can be tuned in the laser specified\
+          \ in MHz.\r\n                It is the oscillation frequency of the corresponding\
+          \ electromagnetic wave. "
+      lower-central-frequency:
+        type: "integer"
+        format: "int32"
+        description: "The lower central frequency that can be tuned in the laser specified\
+          \ in MHz.\r\n                It is the oscillation frequency of the corresponding\
+          \ electromagnetic wave. "
+      frequency-constraint:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+  tapi.photonic.media.CentralFrequencyBandWrapper:
+    properties:
+      supportable-central-frequency-spectrum-band:
+        $ref: "#/definitions/tapi.photonic.media.CentralFrequencyBand"
+  tapi.photonic.media.CentralFrequencyWrapper:
+    properties:
+      central-frequency:
+        $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
   tapi.photonic.media.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
@@ -38947,22 +39038,31 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation3:
     type: "object"
     properties:
-      otsi-assembly-connection-end-point-spec:
+      otsi-connection-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.ConnectionEndPointAugmentation4:
     type: "object"
     properties:
-      media-channel-assembly-spec:
+      ots-connection-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.ConnectionEndPointAugmentation5:
+    type: "object"
+    properties:
+      media-channel-connection-end-point-spec:
+        description: "none"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+    x-augmentation:
+      prefix: "tapi-photonic-media"
+      namespace: "urn:onf:otcc:yang:tapi-photonic-media"
+  tapi.photonic.media.ConnectionEndPointAugmentation6:
     type: "object"
     properties:
       otsi-connection-end-point-spec:
@@ -38972,21 +39072,21 @@ definitions:
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
-  tapi.photonic.media.ConnectionEndPointAugmentation6:
+  tapi.photonic.media.ConnectionEndPointAugmentation7:
     type: "object"
     properties:
-      media-channel-connection-end-point-spec:
+      otsi-assembly-connection-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
-  tapi.photonic.media.ConnectionEndPointAugmentation7:
+  tapi.photonic.media.ConnectionEndPointAugmentation8:
     type: "object"
     properties:
-      ots-connection-end-point-spec:
+      media-channel-assembly-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
@@ -39002,36 +39102,36 @@ definitions:
   tapi.photonic.media.EndPointAugmentation2:
     type: "object"
     properties:
-      media-channel-connectivity-service-end-point-spec:
+      mca-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation3:
     type: "object"
     properties:
-      media-channel-aconnectivity-service-end-point-spec:
+      otsi-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation4:
     type: "object"
     properties:
-      otsi-aconnectivity-service-end-point-spec:
+      media-channel-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
   tapi.photonic.media.EndPointAugmentation5:
     type: "object"
     properties:
-      otsi-connectivity-service-end-point-spec:
+      otsia-connectivity-service-end-point-spec:
         description: "none"
-        $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
+        $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
     x-augmentation:
       prefix: "tapi-photonic-media"
       namespace: "urn:onf:otcc:yang:tapi-photonic-media"
@@ -39062,6 +39162,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "counter: bit error rate after correction by FEC"
+  tapi.photonic.media.FecPropertiesPacWrapper:
+    properties:
+      fec-parameters:
+        $ref: "#/definitions/tapi.photonic.media.FecPropertiesPac"
   tapi.photonic.media.FrequencyConstraint:
     type: "object"
     properties:
@@ -39073,6 +39177,10 @@ definitions:
         description: "Specifies the frequency grid standard used to determine the\
           \ nominal central frequency and frequency slot width"
         $ref: "#/definitions/tapi.photonic.media.GridType"
+  tapi.photonic.media.FrequencyConstraintWrapper:
+    properties:
+      frequency-constraint:
+        $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
   tapi.photonic.media.GridType:
     type: "string"
     enum:
@@ -39112,13 +39220,17 @@ definitions:
       laser-status:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.LaserControlStatusType"
+  tapi.photonic.media.LaserPropertiesPacWrapper:
+    properties:
+      laser-properties:
+        $ref: "#/definitions/tapi.photonic.media.LaserPropertiesPac"
   tapi.photonic.media.LaserType:
     type: "string"
     enum:
     - "PUMP"
     - "MODULATED"
     - "PULSE"
-  tapi.photonic.media.MediaChannelAconnectivityServiceEndPointSpec:
+  tapi.photonic.media.McaConnectivityServiceEndPointSpec:
     type: "object"
     properties:
       number-of-mc:
@@ -39136,8 +39248,16 @@ definitions:
           \ may be omitted if spectrum is specified.\r\n                Capacity cannot\
           \ be omitted if spectrum is not specified."
         $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.photonic.media.McaConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:mca-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpec"
   tapi.photonic.media.MediaChannelAssemblySpec:
     type: "object"
+  tapi.photonic.media.MediaChannelAssemblySpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-assembly-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
   tapi.photonic.media.MediaChannelConfigPac:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -39153,27 +39273,40 @@ definitions:
         \ MC / OTSiMC.\r\n            The [1..*] with MediaChannelAConnectivityServiceEndPointSpec\
         \ allows the configuration of power properties (PowerManagementConfigPac)\
         \ even in case of no spectrum specified, i.e. 'empty' MediaChannelConfigPac."
+  tapi.photonic.media.MediaChannelConfigPacWrapper:
+    properties:
+      mc-config:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
   tapi.photonic.media.MediaChannelConnectionEndPointSpec:
     type: "object"
     properties:
       media-channel:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
+  tapi.photonic.media.MediaChannelConnectionEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
   tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec:
     type: "object"
     properties:
-      power-management-config:
-        description: "none"
-        $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
       mc-config:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConfigPac"
+  tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
   tapi.photonic.media.MediaChannelNodeEdgePointSpec:
     type: "object"
     properties:
       mc-pool:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
+  tapi.photonic.media.MediaChannelNodeEdgePointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-node-edge-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
   tapi.photonic.media.MediaChannelPoolCapabilityPac:
     type: "object"
     properties:
@@ -39192,6 +39325,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
+  tapi.photonic.media.MediaChannelPoolCapabilityPacWrapper:
+    properties:
+      mc-pool:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelPoolCapabilityPac"
   tapi.photonic.media.MediaChannelPropertiesPac:
     type: "object"
     properties:
@@ -39204,6 +39341,10 @@ definitions:
       measured-power-ingress:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+  tapi.photonic.media.MediaChannelPropertiesPacWrapper:
+    properties:
+      media-channel:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
   tapi.photonic.media.MediaChannelServiceInterfacePointSpec:
     type: "object"
     properties:
@@ -39213,6 +39354,10 @@ definitions:
       power-management-capability:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+  tapi.photonic.media.MediaChannelServiceInterfacePointSpecWrapper:
+    properties:
+      tapi-photonic-media:media-channel-service-interface-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
   tapi.photonic.media.ModulationTechnique:
     type: "string"
     enum:
@@ -39241,19 +39386,10 @@ definitions:
       ots-media-channel:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelPropertiesPac"
-  tapi.photonic.media.OtsiAconnectivityServiceEndPointSpec:
-    type: "object"
+  tapi.photonic.media.OtsConnectionEndPointSpecWrapper:
     properties:
-      otsi-config:
-        type: "array"
-        description: "none"
-        items:
-          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
-      number-of-otsi:
-        type: "integer"
-        format: "int32"
-        description: "none"
-        default: 1
+      tapi-photonic-media:ots-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
   tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec:
     type: "object"
     properties:
@@ -39263,14 +39399,23 @@ definitions:
       fec-parameters:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.FecPropertiesPac"
+  tapi.photonic.media.OtsiAssemblyConnectionEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-assembly-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
   tapi.photonic.media.OtsiCapabilityPac:
     type: "object"
     properties:
-      supportable-lower-central-frequency:
+      supportable-central-frequency-spectrum-band:
         type: "array"
-        description: "The lower frequency of the channel spectrum"
+        description: "Each spectrum band supported for otsi trasmitter to be tuned\
+          \ on,\r\n                is specified as per it's lower and upper central\
+          \ frequencies supported and its frequency constraints,\r\n             \
+          \   consisting in the frequency Grid and the AdjustmentGranularity,\r\n\
+          \                used to uniquely identify all central frequencies supported\
+          \ within the band."
         items:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+          $ref: "#/definitions/tapi.photonic.media.CentralFrequencyBand"
       supportable-application-identifier:
         type: "array"
         description: "The list of supportable ApplicationIdentifiers."
@@ -39284,23 +39429,30 @@ definitions:
       total-power-warn-threshold:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPac"
-      supportable-upper-central-frequency:
-        type: "array"
-        description: "The Upper frequency of the channel spectrum"
-        items:
-          $ref: "#/definitions/tapi.photonic.media.CentralFrequency"
+  tapi.photonic.media.OtsiCapabilityPacWrapper:
+    properties:
+      otsi-capability:
+        $ref: "#/definitions/tapi.photonic.media.OtsiCapabilityPac"
   tapi.photonic.media.OtsiConnectionEndPointSpec:
     type: "object"
     properties:
       otsi-termination:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPac"
+  tapi.photonic.media.OtsiConnectionEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-connection-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
   tapi.photonic.media.OtsiConnectivityServiceEndPointSpec:
     type: "object"
     properties:
       otsi-config:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+  tapi.photonic.media.OtsiConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
   tapi.photonic.media.OtsiGserverAdaptationPac:
     type: "object"
     properties:
@@ -39308,6 +39460,10 @@ definitions:
         type: "integer"
         format: "int32"
         description: "none"
+  tapi.photonic.media.OtsiGserverAdaptationPacWrapper:
+    properties:
+      otsi-adapter:
+        $ref: "#/definitions/tapi.photonic.media.OtsiGserverAdaptationPac"
   tapi.photonic.media.OtsiServiceInterfacePointSpec:
     type: "object"
     properties:
@@ -39317,6 +39473,10 @@ definitions:
       power-management-capability:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
+  tapi.photonic.media.OtsiServiceInterfacePointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsi-service-interface-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
   tapi.photonic.media.OtsiTerminationConfigPac:
     allOf:
     - $ref: "#/definitions/tapi.common.LocalClass"
@@ -39355,6 +39515,10 @@ definitions:
         \ OTSi.\r\n            In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec),\
         \ it is intended that the choice of the parameter values is fully delegated\
         \ to the server controller."
+  tapi.photonic.media.OtsiTerminationConfigPacWrapper:
+    properties:
+      otsi-config:
+        $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
   tapi.photonic.media.OtsiTerminationPac:
     type: "object"
     properties:
@@ -39395,7 +39559,28 @@ definitions:
       selected-spectrum:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
-  tapi.photonic.media.OwnedNodeEdgePointAugmentation3:
+  tapi.photonic.media.OtsiTerminationPacWrapper:
+    properties:
+      otsi-termination:
+        $ref: "#/definitions/tapi.photonic.media.OtsiTerminationPac"
+  tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec:
+    type: "object"
+    properties:
+      otsi-config:
+        type: "array"
+        description: "none"
+        items:
+          $ref: "#/definitions/tapi.photonic.media.OtsiTerminationConfigPac"
+      number-of-otsi:
+        type: "integer"
+        format: "int32"
+        description: "none"
+        default: 1
+  tapi.photonic.media.OtsiaConnectivityServiceEndPointSpecWrapper:
+    properties:
+      tapi-photonic-media:otsia-connectivity-service-end-point-spec:
+        $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
+  tapi.photonic.media.OwnedNodeEdgePointAugmentation2:
     type: "object"
     properties:
       media-channel-node-edge-point-spec:
@@ -39428,6 +39613,10 @@ definitions:
           \                at the Logical-Termination-Point (LTP) associated to the\
           \ SIP."
         $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+  tapi.photonic.media.PowerManagementCapabilityPacWrapper:
+    properties:
+      power-management-capability:
+        $ref: "#/definitions/tapi.photonic.media.PowerManagementCapabilityPac"
   tapi.photonic.media.PowerManagementConfigPac:
     type: "object"
     properties:
@@ -39451,6 +39640,10 @@ definitions:
           \n                desired at the Logical-Termination-Point (LTP) associated\
           \ to the CSEP."
         $ref: "#/definitions/tapi.photonic.media.PowerProperties"
+  tapi.photonic.media.PowerManagementConfigPacWrapper:
+    properties:
+      power-management-config-pac:
+        $ref: "#/definitions/tapi.photonic.media.PowerManagementConfigPac"
   tapi.photonic.media.PowerProperties:
     type: "object"
     properties:
@@ -39471,6 +39664,14 @@ definitions:
       total-power:
         type: "string"
         description: "The total power at any point in a channel specified in dBm."
+  tapi.photonic.media.PowerPropertiesPacWrapper:
+    properties:
+      transmit-power:
+        $ref: "#/definitions/tapi.photonic.media.PowerPropertiesPac"
+  tapi.photonic.media.PowerPropertiesWrapper:
+    properties:
+      supportable-maximum-output-power:
+        $ref: "#/definitions/tapi.photonic.media.PowerProperties"
   tapi.photonic.media.SelectedModulation:
     type: "string"
     enum:
@@ -39536,6 +39737,10 @@ definitions:
       frequency-constraint:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.FrequencyConstraint"
+  tapi.photonic.media.SpectrumBandWrapper:
+    properties:
+      available-spectrum:
+        $ref: "#/definitions/tapi.photonic.media.SpectrumBand"
   tapi.photonic.media.TotalPowerThresholdPac:
     type: "object"
     properties:
@@ -39557,6 +39762,10 @@ definitions:
       total-power-lower-warn-threshold-default:
         type: "string"
         description: "Can read the value of the default  threshold that was set"
+  tapi.photonic.media.TotalPowerThresholdPacWrapper:
+    properties:
+      total-power-warn-threshold:
+        $ref: "#/definitions/tapi.photonic.media.TotalPowerThresholdPac"
   tapi.streaming.AvailableStream:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -39590,6 +39799,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-streaming:stream-context/tapi-streaming:available-stream/tapi-streaming:uuid"
+  tapi.streaming.AvailableStreamRefWrapper:
+    properties:
+      available-stream:
+        $ref: "#/definitions/tapi.streaming.AvailableStreamRef"
+  tapi.streaming.AvailableStreamWrapper:
+    properties:
+      available-stream:
+        $ref: "#/definitions/tapi.streaming.AvailableStream"
   tapi.streaming.CompactedLogDetails:
     type: "object"
     properties:
@@ -39613,6 +39830,10 @@ definitions:
           \n                Key word 'FOREVER' means that Tombstone records will never\
           \ be removed from the log.\r\n                Can be adjusted by an administrator\
           \ (via a separate view) through the life of the stream."
+  tapi.streaming.CompactedLogDetailsWrapper:
+    properties:
+      compacted-log-details:
+        $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
   tapi.streaming.ConnectionProtocolDetails:
     type: "object"
     properties:
@@ -39621,21 +39842,25 @@ definitions:
         description: "Name of the allowed protocol."
         items:
           type: "string"
+  tapi.streaming.ConnectionProtocolDetailsWrapper:
+    properties:
+      connection-protocol-details:
+        $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
   tapi.streaming.ContextAugmentation1:
     type: "object"
     properties:
-      stream-context:
+      stream-admin-context:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.context.StreamContext"
+        $ref: "#/definitions/tapi.streaming.StreamAdminContext"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
   tapi.streaming.ContextAugmentation2:
     type: "object"
     properties:
-      stream-admin-context:
+      stream-context:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.StreamAdminContext"
+        $ref: "#/definitions/tapi.streaming.context.StreamContext"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
@@ -39712,6 +39937,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.streaming.StreamMonitor"
       description: "Context providing access to stream administration functionality."
+  tapi.streaming.StreamAdminContextWrapper:
+    properties:
+      tapi-streaming:stream-admin-context:
+        $ref: "#/definitions/tapi.streaming.StreamAdminContext"
   tapi.streaming.StreamMonitor:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -39739,6 +39968,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.streaming.AvailableStreamRef"
       description: "Information on the monitoring of the use of a specific AvailableStream."
+  tapi.streaming.StreamMonitorWrapper:
+    properties:
+      stream-monitor:
+        $ref: "#/definitions/tapi.streaming.StreamMonitor"
   tapi.streaming.SupportedStreamType:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -39775,18 +40008,18 @@ definitions:
   tapi.streaming.SupportedStreamTypeAugmentation1:
     type: "object"
     properties:
-      connection-protocol-details:
+      compacted-log-details:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
+        $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
   tapi.streaming.SupportedStreamTypeAugmentation2:
     type: "object"
     properties:
-      compacted-log-details:
+      connection-protocol-details:
         description: "none"
-        $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
+        $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
     x-augmentation:
       prefix: "tapi-streaming"
       namespace: "urn:onf:otcc:yang:tapi-streaming"
@@ -39797,6 +40030,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-streaming:stream-context/tapi-streaming:supported-stream-type/tapi-streaming:uuid"
+  tapi.streaming.SupportedStreamTypeRefWrapper:
+    properties:
+      supported-stream-type:
+        $ref: "#/definitions/tapi.streaming.SupportedStreamTypeRef"
   tapi.streaming.connecttostream.Input:
     type: "object"
     properties:
@@ -39821,6 +40058,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.streaming.AvailableStream"
       description: "none"
+  tapi.streaming.context.StreamContextWrapper:
+    properties:
+      tapi-streaming:stream-context:
+        $ref: "#/definitions/tapi.streaming.context.StreamContext"
   tapi.streaming.getavailablestreamconnectiondetails.Output:
     type: "object"
     properties:
@@ -39842,6 +40083,10 @@ definitions:
     - $ref: "#/definitions/tapi.streaming.SupportedStreamType"
     - $ref: "#/definitions/tapi.streaming.SupportedStreamTypeAugmentation1"
     - $ref: "#/definitions/tapi.streaming.SupportedStreamTypeAugmentation2"
+  tapi.streaming.streamcontext.SupportedStreamTypeWrapper:
+    properties:
+      supported-stream-type:
+        $ref: "#/definitions/tapi.streaming.streamcontext.SupportedStreamType"
   tapi.topology.ConnectionSpecReference:
     type: "object"
     properties:
@@ -39855,6 +40100,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation9:
     type: "object"
     properties:
@@ -39878,6 +40127,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -39934,6 +40187,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -39960,6 +40217,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -40014,6 +40275,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid"
       description: "none"
+  tapi.topology.LinkRefWrapper:
+    properties:
+      supported-client-link:
+        $ref: "#/definitions/tapi.topology.LinkRef"
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -40025,6 +40294,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -40114,6 +40387,10 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -40169,6 +40446,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -40191,6 +40476,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -40211,6 +40500,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -40236,6 +40529,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-diversity-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -40350,6 +40647,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -40369,6 +40670,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -40406,6 +40711,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -40413,6 +40722,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -40478,6 +40791,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -40562,10 +40879,14 @@ definitions:
   tapi.topology.node.OwnedNodeEdgePoint:
     allOf:
     - $ref: "#/definitions/tapi.connectivity.OwnedNodeEdgePointAugmentation4"
-    - $ref: "#/definitions/tapi.equipment.OwnedNodeEdgePointAugmentation1"
-    - $ref: "#/definitions/tapi.odu.OwnedNodeEdgePointAugmentation2"
-    - $ref: "#/definitions/tapi.photonic.media.OwnedNodeEdgePointAugmentation3"
+    - $ref: "#/definitions/tapi.equipment.OwnedNodeEdgePointAugmentation3"
+    - $ref: "#/definitions/tapi.odu.OwnedNodeEdgePointAugmentation1"
+    - $ref: "#/definitions/tapi.photonic.media.OwnedNodeEdgePointAugmentation2"
     - $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+  tapi.topology.node.OwnedNodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.node.OwnedNodeEdgePoint"
   tapi.topology.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -40601,6 +40922,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
       description: "none"
+  tapi.topology.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.topology.Node"
   tapi.topology.topologycontext.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -40622,7 +40947,11 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.topology.Node"
       description: "none"
-  tapi.virtual.network.ContextAugmentation5:
+  tapi.topology.topologycontext.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.topologycontext.Topology"
+  tapi.virtual.network.ContextAugmentation6:
     type: "object"
     properties:
       virtual-network-context:
@@ -40693,6 +41022,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
       description: "none"
+  tapi.virtual.network.VirtualNetworkConstraintWrapper:
+    properties:
+      vnw-constraint:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
   tapi.virtual.network.VirtualNetworkContext:
     type: "object"
     properties:
@@ -40701,6 +41034,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+  tapi.virtual.network.VirtualNetworkContextWrapper:
+    properties:
+      tapi-virtual-network:virtual-network-context:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
   tapi.virtual.network.VirtualNetworkService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -40764,6 +41101,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.virtual.network.VirtualNetworkServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+  tapi.virtual.network.VirtualNetworkServiceWrapper:
+    properties:
+      virtual-nw-service:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
   tapi.virtual.network.VirtualNwServiceRef:
     type: "object"
     properties:
@@ -40771,6 +41116,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-virtual-network:virtual-network-context/tapi-virtual-network:virtual-nw-service/tapi-virtual-network:uuid"
+  tapi.virtual.network.VirtualNwServiceRefWrapper:
+    properties:
+      diversity-exclusion:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNwServiceRef"
   tapi.virtual.network.createvirtualnetworkservice.Input:
     type: "object"
     properties:
diff --git a/OAS/tapi-topology@2020-04-23.yaml b/OAS/tapi-topology@2020-04-23.yaml
index 533e1c35..ca35d677 100644
--- a/OAS/tapi-topology@2020-04-23.yaml
+++ b/OAS/tapi-topology@2020-04-23.yaml
@@ -1,41 +1,41 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Topology Model definitions.\r\
-    \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
+    \ the Apache License 2.0,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
     \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
     \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
     \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
     \ some artifacts are considered *experimental*, and thus the corresponding YANG\
     \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
     \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
     \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
     \ >.\r\n          YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0,\r\n        This module contains TAPI Common Model definitions.\r\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
     \ specifications have been generated from the corresponding UML model using the\
@@ -52,15 +52,15 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
-  title: "tapi-topology,tapi-notification,tapi-common API"
+  version: "2.1.3"
+  title: "tapi-notification,tapi-topology,tapi-common API"
 host: "localhost:1234"
 consumes:
 - "application/yang-data+json"
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -71,7 +71,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -85,7 +85,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -104,7 +104,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -123,7 +123,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/name/:
     post:
       tags:
       - "tapi-common"
@@ -137,7 +137,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -145,7 +145,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -163,7 +163,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -184,7 +184,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -210,32 +210,19 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.notification.NotificationContext"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -243,18 +230,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePoint"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -264,100 +275,158 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationSubscriptionService"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
     post:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -365,7 +434,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
@@ -373,7 +442,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -381,10 +450,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -392,7 +461,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -404,12 +473,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -417,7 +486,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -430,7 +499,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -440,7 +509,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -448,7 +517,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -461,277 +530,218 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
-        required: true
-        type: "string"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+    post:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
-      description: "none"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
-        200:
-          description: "tapi.notification.SubscriptionFilter"
-          schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -739,10 +749,29 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NotificationSubscriptionService"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -751,11 +780,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -766,7 +796,7 @@ paths:
     delete:
       tags:
       - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -779,7 +809,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -798,7 +828,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -806,7 +836,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -829,7 +859,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -855,7 +885,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -886,378 +916,328 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      summary: "returns tapi.notification.NotificationChannel"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "none"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of additional-info"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.notification.AlarmInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
-        400:
-          description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
-        required: true
-        type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of name"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of target-object-name"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.ServiceInterfacePoint"
-          schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-        400:
-          description: "Internal error"
-    put:
-      tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.notification.NameAndValueChange"
+          schema:
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
-      parameters:
-      - name: "uuid"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
+        in: "path"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1265,7 +1245,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
@@ -1273,7 +1253,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1281,10 +1261,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1292,7 +1272,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1304,12 +1284,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1317,7 +1297,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1330,7 +1310,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1340,7 +1320,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1348,7 +1328,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1361,142 +1341,162 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -1507,7 +1507,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -1521,7 +1521,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -1540,7 +1540,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -1559,7 +1559,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -1570,10 +1570,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -1591,10 +1591,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -1610,10 +1610,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -1629,10 +1629,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -1653,10 +1653,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -1677,10 +1677,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -1701,11 +1701,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -1725,10 +1725,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -1749,11 +1749,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -1773,11 +1773,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -1797,10 +1797,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -1822,10 +1822,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -1852,11 +1852,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -1882,10 +1882,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -1913,10 +1913,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -1952,10 +1952,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -1976,11 +1976,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -2006,10 +2006,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -2031,11 +2031,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -2055,10 +2055,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2079,10 +2079,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2103,11 +2103,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2127,10 +2127,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2151,10 +2151,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -2176,11 +2176,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -2206,10 +2206,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2232,10 +2232,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -2256,10 +2256,10 @@ paths:
         200:
           description: "tapi.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.Node"
+            $ref: "#/definitions/tapi.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -2295,10 +2295,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -2319,10 +2319,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -2343,11 +2343,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2367,10 +2367,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2391,11 +2391,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2415,11 +2415,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2439,10 +2439,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -2464,10 +2464,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2494,10 +2494,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -2518,11 +2518,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -2548,10 +2548,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2579,11 +2579,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -2608,11 +2608,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -2637,10 +2637,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -2666,10 +2666,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2695,10 +2695,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2724,10 +2724,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2753,10 +2753,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2782,10 +2782,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2812,10 +2812,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -2847,10 +2847,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -2883,10 +2883,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -2935,10 +2935,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -2969,10 +2969,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -3003,10 +3003,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3037,10 +3037,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3071,10 +3071,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3105,10 +3105,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3139,10 +3139,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3174,10 +3174,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3214,10 +3214,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3254,10 +3254,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3295,10 +3295,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3335,10 +3335,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -3374,10 +3374,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -3425,10 +3425,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -3466,10 +3466,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3512,10 +3512,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -3553,10 +3553,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -3588,10 +3588,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -3622,10 +3622,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3656,10 +3656,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3690,10 +3690,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3724,10 +3724,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3758,10 +3758,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3793,10 +3793,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3828,11 +3828,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -3864,10 +3864,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -3908,10 +3908,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -3954,10 +3954,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3989,11 +3989,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -4023,10 +4023,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -4069,10 +4069,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -4105,10 +4105,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4146,10 +4146,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -4182,10 +4182,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4212,10 +4212,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4241,10 +4241,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4270,10 +4270,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4299,10 +4299,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4328,10 +4328,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4357,10 +4357,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4387,11 +4387,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeEdgePoint"
@@ -4416,10 +4416,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4460,10 +4460,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4489,10 +4489,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4518,10 +4518,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4547,10 +4547,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4576,10 +4576,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4605,10 +4605,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4634,10 +4634,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4664,10 +4664,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4700,10 +4700,10 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4736,10 +4736,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4766,10 +4766,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4795,10 +4795,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4824,10 +4824,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4853,10 +4853,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4882,10 +4882,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4911,10 +4911,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4941,10 +4941,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -4966,11 +4966,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -4990,10 +4990,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5014,10 +5014,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5038,11 +5038,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -5062,10 +5062,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5086,10 +5086,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -5111,125 +5111,112 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /operations/create-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-list/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
       - "tapi-notification"
@@ -5252,7 +5239,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
       - "tapi-notification"
@@ -5275,7 +5262,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
       - "tapi-notification"
@@ -5289,132 +5276,145 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
-      parameters:
-      - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+      - "tapi-notification"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-notification:update-notification-subscription-service/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      parameters:
+      - in: "body"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
       - "tapi-topology"
-      summary: "operates on tapi.topology.GetTopologyDetails"
-      description: "operates on tapi.topology.GetTopologyDetails"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
       parameters:
       - in: "body"
-        name: "tapi.topology.gettopologydetails.Input.body-param"
+        name: "tapi.topology.getnodedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-topology:get-node-edge-point-details/:
     post:
       tags:
       - "tapi-topology"
-      parameters: []
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetTopologyList"
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetTopologyDetails"
+      description: "operates on tapi.topology.GetTopologyDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.topology.gettopologydetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.topology.gettopologydetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.topology.GetTopologyDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      - "tapi-topology"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetTopologyList"
         201:
           description: "No response"
         400:
@@ -5470,6 +5470,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -5513,11 +5517,23 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation2"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.ForwardingDirection:
     type: "string"
     enum:
@@ -5591,6 +5607,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -5642,6 +5662,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      mapped-service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -5731,6 +5759,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -5782,6 +5814,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -5854,6 +5890,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -5867,6 +5907,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -5897,6 +5941,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -5905,6 +5953,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -5993,6 +6045,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -6025,6 +6081,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -6144,6 +6204,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation2:
     type: "object"
     properties:
@@ -6167,6 +6231,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -6223,6 +6291,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -6249,6 +6321,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -6293,6 +6369,10 @@ definitions:
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "The Link object class models effective adjacency between two or\
         \ more ForwardingDomains (FD). "
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -6304,6 +6384,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -6393,6 +6477,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+  tapi.topology.NodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePoint"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -6448,6 +6540,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+  tapi.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.Node"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -6470,6 +6574,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -6490,6 +6598,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -6515,6 +6627,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -6629,6 +6745,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -6648,6 +6768,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -6685,6 +6809,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -6692,6 +6820,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -6757,6 +6893,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
diff --git a/OAS/tapi-virtual-network@2020-04-23.yaml b/OAS/tapi-virtual-network@2020-06-16.yaml
similarity index 84%
rename from OAS/tapi-virtual-network@2020-04-23.yaml
rename to OAS/tapi-virtual-network@2020-06-16.yaml
index d9eb6ba4..1b1134f2 100644
--- a/OAS/tapi-virtual-network@2020-04-23.yaml
+++ b/OAS/tapi-virtual-network@2020-06-16.yaml
@@ -1,28 +1,11 @@
 ---
 swagger: "2.0"
 info:
-  description: "\r\n        This module contains TAPI Topology Model definitions.\r\
-    \n        Source: TapiTopology.uml\r\n        - The TAPI YANG models included\
+  description: "\r\n        This module contains TAPI Notification Model definitions.\r\
+    \n        Source: TapiNotification.uml\r\n        - The TAPI YANG models included\
     \ in this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The\
     \ YANG specifications have been generated from the corresponding UML model using\
-    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
-    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
-    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
-    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
-    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
-    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
-    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
-    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
-    \       The YANG model backward compatibility criteria are outlined in section\
-    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
-    \ >.\r\n          YANG models included in this release may not be backward compatible\
-    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
-    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
-    \ the Apache License 2.0.,\r\n        This module contains TAPI Notification Model\
-    \ definitions.\r\n        Source: TapiNotification.uml\r\n        - The TAPI YANG\
-    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
-    \n        - The YANG specifications have been generated from the corresponding\
-    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
+    \ the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$\
     \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
     \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$\
     \ >\r\n        - Status of YANG model artifacts can be determined by referring\
@@ -52,6 +35,23 @@ info:
     \n        YANG models included in this release may not be backward compatible\
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
+    \ the Apache License 2.0.,\r\n        This module contains TAPI Topology Model\
+    \ definitions.\r\n        Source: TapiTopology.uml\r\n        - The TAPI YANG\
+    \ models included in this TAPI release are a *normative* part of the TAPI SDK.\r\
+    \n        - The YANG specifications have been generated from the corresponding\
+    \ UML model using the [ONF EAGLE UML2YANG mapping tool]\r\n          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$\
+    \ >\r\n          and further edited manually to comply with the [ONF IISOMI UML2YANG\
+    \ mapping guidelines]\r\n          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$\
+    \ >\r\n        - Status of YANG model artifacts can be determined by referring\
+    \ to the corresponding UML artifacts.\r\n          As described in the UML models,\
+    \ some artifacts are considered *experimental*, and thus the corresponding YANG\
+    \ artifacts.\r\n        - The ONF TAPI release process does not guarantee backward\
+    \ compatibility of YANG models across major versions of TAPI releases.\r\n   \
+    \       The YANG model backward compatibility criteria are outlined in section\
+    \ 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$\
+    \ >.\r\n          YANG models included in this release may not be backward compatible\
+    \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
+    \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0.,\r\n        This module contains TAPI Common Model definitions.\r\
     \n        Source: TapiCommon.uml\r\n        - The TAPI YANG models included in\
     \ this TAPI release are a *normative* part of the TAPI SDK.\r\n        - The YANG\
@@ -69,15 +69,15 @@ info:
     \ with previous TAPI releases.\r\n        Copyright (c) 2018 Open Networking Foundation\
     \ (ONF). All rights reserved.\r\n        License: This module is distributed under\
     \ the Apache License 2.0."
-  version: "2.2.0"
-  title: "tapi-topology,tapi-notification,tapi-virtual-network,tapi-common API"
+  version: "2.1.3"
+  title: "tapi-notification,tapi-virtual-network,tapi-topology,tapi-common API"
 host: "localhost:1234"
 consumes:
 - "application/yang-data+json"
 produces:
 - "application/yang-data+json"
 paths:
-  /data/context/:
+  /data/tapi-common:context/:
     get:
       tags:
       - "tapi-common"
@@ -88,7 +88,7 @@ paths:
         200:
           description: "tapi.common.Context"
           schema:
-            $ref: "#/definitions/tapi.common.Context"
+            $ref: "#/definitions/tapi.common.ContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -102,7 +102,7 @@ paths:
         description: "tapi.common.Context to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -121,7 +121,7 @@ paths:
         description: "tapi.common.Context to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Context"
+          $ref: "#/definitions/tapi.common.ContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -140,7 +140,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/name/:
+  /data/tapi-common:context/name/:
     post:
       tags:
       - "tapi-common"
@@ -154,7 +154,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -162,7 +162,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/name={value-name}/:
+  /data/tapi-common:context/name={value-name}/:
     get:
       tags:
       - "tapi-common"
@@ -180,7 +180,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -201,7 +201,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -227,32 +227,19 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/:
-    get:
-      tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
-      responses:
-        200:
-          description: "tapi.notification.NotificationContext"
-          schema:
-            $ref: "#/definitions/tapi.notification.NotificationContext"
-        400:
-          description: "Internal error"
+  /data/tapi-common:context/service-interface-point/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added to list"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -260,18 +247,42 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/service-interface-point={uuid}/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.ServiceInterfacePoint"
+          schema:
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
+      - "tapi-common"
+      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      description: "none"
       parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       - in: "body"
-        name: "tapi.notification.NotificationContext.body-param"
-        description: "tapi.notification.NotificationContext to be added or updated"
+        name: "tapi.common.ServiceInterfacePoint.body-param"
+        description: "tapi.common.ServiceInterfacePoint to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.NotificationContext"
+          $ref: "#/definitions/tapi.common.ServiceInterfacePointWrapper"
       responses:
         201:
           description: "Object created"
@@ -281,100 +292,158 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationContext"
-      description: "Augments the base TAPI Context with NotificationService information"
-      parameters: []
+      - "tapi-common"
+      summary: "removes tapi.common.ServiceInterfacePoint"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
         400:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription/:
-    post:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "Capacity available to be assigned."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.Capacity"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
       description: "none"
       parameters:
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.BandwidthProfile"
+          schema:
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationSubscriptionService"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-    put:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.notification.NotificationSubscriptionService.body-param"
-        description: "tapi.notification.NotificationSubscriptionService to be added\
-          \ or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
       responses:
-        201:
-          description: "Object created"
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
+    get:
       tags:
-      - "tapi-notification"
-      summary: "removes tapi.notification.NotificationSubscriptionService"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/name/:
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/available-capacity/total-size/:
+    get:
+      tags:
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of service-interface-point"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.common.CapacityValue"
+          schema:
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
+        400:
+          description: "Internal error"
+  /data/tapi-common:context/service-interface-point={uuid}/name/:
     post:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -382,7 +451,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - in: "body"
@@ -390,7 +459,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -398,10 +467,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -409,7 +478,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -421,12 +490,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -434,7 +503,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -447,7 +516,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -457,7 +526,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-notification"
+      - "tapi-common"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -465,7 +534,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       - name: "value-name"
@@ -478,277 +547,218 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NotificationChannel"
-      description: "none"
+      - "tapi-common"
+      summary: "returns tapi.common.Capacity"
+      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
+        \ that any shared capacity is available to be taken."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NotificationChannel"
+          description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.notification.NotificationChannel"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.BandwidthProfile"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of additional-info"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/:
+  /data/tapi-common:context/service-interface-point={uuid}/total-potential-capacity/total-size/:
     get:
       tags:
-      - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      - "tapi-common"
+      summary: "returns tapi.common.CapacityValue"
+      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
+        \ this is expected to same as the committedInformationRate."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of name"
+        description: "Id of service-interface-point"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
-      - name: "value-name"
-        in: "path"
-        description: "Id of target-object-name"
-        required: true
-        type: "string"
+      summary: "returns tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NotificationContext"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/:
-    get:
+    post:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      summary: "creates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
-      - name: "notification-uuid"
-        in: "path"
-        description: "Id of notification"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
       responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.SubscriptionFilter"
-      description: "none"
+      summary: "creates or updates tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
+      - in: "body"
+        name: "tapi.notification.NotificationContext.body-param"
+        description: "tapi.notification.NotificationContext to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.NotificationContextWrapper"
+      responses:
+        201:
+          description: "Object created"
+        400:
+          description: "Internal error"
+        204:
+          description: "Object modified"
+    delete:
+      tags:
+      - "tapi-notification"
+      summary: "removes tapi.notification.NotificationContext"
+      description: "Augments the base TAPI Context with NotificationService information"
+      parameters: []
       responses:
-        200:
-          description: "tapi.notification.SubscriptionFilter"
-          schema:
-            $ref: "#/definitions/tapi.notification.SubscriptionFilter"
         400:
           description: "Internal error"
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription/:
     post:
       tags:
       - "tapi-notification"
-      summary: "creates tapi.notification.SubscriptionFilter"
+      summary: "creates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
-      - name: "uuid"
-        in: "path"
-        description: "Id of notif-subscription"
-        required: true
-        type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added to list"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -756,10 +766,29 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/:
+    get:
+      tags:
+      - "tapi-notification"
+      summary: "returns tapi.notification.NotificationSubscriptionService"
+      description: "none"
+      parameters:
+      - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      responses:
+        200:
+          description: "tapi.notification.NotificationSubscriptionService"
+          schema:
+            $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
+        400:
+          description: "Internal error"
     put:
       tags:
       - "tapi-notification"
-      summary: "creates or updates tapi.notification.SubscriptionFilter"
+      summary: "creates or updates tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -768,11 +797,12 @@ paths:
         required: true
         type: "string"
       - in: "body"
-        name: "tapi.notification.SubscriptionFilter.body-param"
-        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        name: "tapi.notification.NotificationSubscriptionService.body-param"
+        description: "tapi.notification.NotificationSubscriptionService to be added\
+          \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.notification.SubscriptionFilter"
+          $ref: "#/definitions/tapi.notification.NotificationSubscriptionServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -783,7 +813,7 @@ paths:
     delete:
       tags:
       - "tapi-notification"
-      summary: "removes tapi.notification.SubscriptionFilter"
+      summary: "removes tapi.notification.NotificationSubscriptionService"
       description: "none"
       parameters:
       - name: "uuid"
@@ -796,7 +826,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name/:
     post:
       tags:
       - "tapi-notification"
@@ -815,7 +845,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -823,7 +853,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-notification"
@@ -846,7 +876,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -872,7 +902,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -903,378 +933,328 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/notification-context/notification={uuid}/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.Notification"
+      summary: "returns tapi.notification.NotificationChannel"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.Notification"
+          description: "tapi.notification.NotificationChannel"
           schema:
-            $ref: "#/definitions/tapi.notification.Notification"
+            $ref: "#/definitions/tapi.notification.NotificationChannelWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/additional-info={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification-channel/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
-      description: "none"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of additional-info"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/alarm-info/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/:
     get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.AlarmInfo"
+      summary: "returns tapi.notification.Notification"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.AlarmInfo"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.notification.AlarmInfo"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/changed-attributes={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/additional-info={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.NameAndValueChange"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of changed-attributes"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.notification.NameAndValueChange"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.notification.NameAndValueChange"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/alarm-info/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
-      description: "List of names. A property of an entity with a value that is unique\
-        \ in some namespace but may change during the life of the entity. A name carries\
-        \ no semantics with respect to the purpose of the entity."
+      summary: "returns tapi.notification.AlarmInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of notification"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - name: "value-name"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of name"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/target-object-name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/changed-attributes={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.common.NameAndValue"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
       - name: "value-name"
         in: "path"
-        description: "Id of target-object-name"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.NameAndValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/notification-context/notification={uuid}/tca-info/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-notification"
-      summary: "returns tapi.notification.TcaInfo"
-      description: "none"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
+        in: "path"
+        description: "Id of notif-subscription"
+        required: true
+        type: "string"
+      - name: "notification-uuid"
         in: "path"
         description: "Id of notification"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.notification.TcaInfo"
-          schema:
-            $ref: "#/definitions/tapi.notification.TcaInfo"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point/:
-    post:
-      tags:
-      - "tapi-common"
-      summary: "creates tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added to list"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        409:
-          description: "Object already exists"
-  /data/context/service-interface-point={uuid}/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.ServiceInterfacePoint"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-    put:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/target-object-name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "creates or updates tapi.common.ServiceInterfacePoint"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      - in: "body"
-        name: "tapi.common.ServiceInterfacePoint.body-param"
-        description: "tapi.common.ServiceInterfacePoint to be added or updated"
-        required: false
-        schema:
-          $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
-      responses:
-        201:
-          description: "Object created"
-        400:
-          description: "Internal error"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "tapi-common"
-      summary: "removes tapi.common.ServiceInterfacePoint"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /data/context/service-interface-point={uuid}/available-capacity/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "Capacity available to be assigned."
-      parameters:
-      - name: "uuid"
+      - name: "value-name"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/notification={notification-uuid}/tca-info/
+  : get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
-      responses:
-        200:
-          description: "tapi.common.BandwidthProfile"
-          schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
-        400:
-          description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
-      tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
-      parameters:
-      - name: "uuid"
+      - name: "notification-uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.SubscriptionFilter"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+    post:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added to list"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+        409:
+          description: "Object already exists"
+    put:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "creates or updates tapi.notification.SubscriptionFilter"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
+      - in: "body"
+        name: "tapi.notification.SubscriptionFilter.body-param"
+        description: "tapi.notification.SubscriptionFilter to be added or updated"
+        required: false
+        schema:
+          $ref: "#/definitions/tapi.notification.SubscriptionFilterWrapper"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+        201:
+          description: "Object created"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/available-capacity/total-size/:
-    get:
+        204:
+          description: "Object modified"
+    delete:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "removes tapi.notification.SubscriptionFilter"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       responses:
-        200:
-          description: "tapi.common.CapacityValue"
-          schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/name/:
+        204:
+          description: "Object deleted"
+  /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name/:
     post:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1282,7 +1262,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - in: "body"
@@ -1290,7 +1270,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1298,10 +1278,10 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/service-interface-point={uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-notification:notification-context/notif-subscription={uuid}/subscription-filter/name={value-name}/
+  : get:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "returns tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1309,7 +1289,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1321,12 +1301,12 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "creates or updates tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1334,7 +1314,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1347,7 +1327,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -1357,7 +1337,7 @@ paths:
           description: "Object modified"
     delete:
       tags:
-      - "tapi-common"
+      - "tapi-notification"
       summary: "removes tapi.common.NameAndValue"
       description: "List of names. A property of an entity with a value that is unique\
         \ in some namespace but may change during the life of the entity. A name carries\
@@ -1365,7 +1345,7 @@ paths:
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notif-subscription"
         required: true
         type: "string"
       - name: "value-name"
@@ -1378,142 +1358,162 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.Capacity"
-      description: "An optimistic view of the capacity of the TopologicalEntity assuming\
-        \ that any shared capacity is available to be taken."
+      - "tapi-notification"
+      summary: "returns tapi.notification.Notification"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.Capacity"
+          description: "tapi.notification.Notification"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.notification.NotificationWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/additional-info={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.BandwidthProfile"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of additional-info"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.BandwidthProfile"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/alarm-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.AlarmInfo"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.AlarmInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.AlarmInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/changed-attributes={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.notification.NameAndValueChange"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of changed-attributes"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.NameAndValueChange"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.NameAndValueChangeWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "none"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
+      description: "List of names. A property of an entity with a value that is unique\
+        \ in some namespace but may change during the life of the entity. A name carries\
+        \ no semantics with respect to the purpose of the entity."
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/target-object-name={value-name}/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
+      - "tapi-notification"
+      summary: "returns tapi.common.NameAndValue"
       description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
+        required: true
+        type: "string"
+      - name: "value-name"
+        in: "path"
+        description: "Id of target-object-name"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/service-interface-point={uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-notification:notification-context/notification={uuid}/tca-info/:
     get:
       tags:
-      - "tapi-common"
-      summary: "returns tapi.common.CapacityValue"
-      description: "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile,\
-        \ this is expected to same as the committedInformationRate."
+      - "tapi-notification"
+      summary: "returns tapi.notification.TcaInfo"
+      description: "none"
       parameters:
       - name: "uuid"
         in: "path"
-        description: "Id of service-interface-point"
+        description: "Id of notification"
         required: true
         type: "string"
       responses:
         200:
-          description: "tapi.common.CapacityValue"
+          description: "tapi.notification.TcaInfo"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.notification.TcaInfoWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/:
+  /data/tapi-common:context/tapi-topology:topology-context/:
     get:
       tags:
       - "tapi-topology"
@@ -1524,7 +1524,7 @@ paths:
         200:
           description: "tapi.topology.TopologyContext"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyContext"
+            $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -1538,7 +1538,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -1557,7 +1557,7 @@ paths:
         description: "tapi.topology.TopologyContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.TopologyContext"
+          $ref: "#/definitions/tapi.topology.TopologyContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -1576,7 +1576,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/topology-context/nw-topology-service/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/:
     get:
       tags:
       - "tapi-topology"
@@ -1587,10 +1587,10 @@ paths:
         200:
           description: "tapi.topology.NetworkTopologyService"
           schema:
-            $ref: "#/definitions/tapi.topology.NetworkTopologyService"
+            $ref: "#/definitions/tapi.topology.NetworkTopologyServiceWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -1608,10 +1608,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/nw-topology-service/topology={topology-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/nw-topology-service/topology={topology-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -1627,10 +1627,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -1646,10 +1646,10 @@ paths:
         200:
           description: "tapi.topology.Topology"
           schema:
-            $ref: "#/definitions/tapi.topology.Topology"
+            $ref: "#/definitions/tapi.topology.TopologyWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -1670,10 +1670,10 @@ paths:
         200:
           description: "tapi.topology.Link"
           schema:
-            $ref: "#/definitions/tapi.topology.Link"
+            $ref: "#/definitions/tapi.topology.LinkWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -1694,10 +1694,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -1718,11 +1718,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -1742,10 +1742,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -1766,11 +1766,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -1790,11 +1790,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -1814,10 +1814,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -1839,10 +1839,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -1869,11 +1869,11 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -1899,10 +1899,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -1930,10 +1930,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/node-edge-point={topology-uuid},{node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -1969,10 +1969,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/resilience-type/:
     get:
       tags:
       - "tapi-topology"
@@ -1993,11 +1993,11 @@ paths:
         200:
           description: "tapi.topology.ResilienceType"
           schema:
-            $ref: "#/definitions/tapi.topology.ResilienceType"
+            $ref: "#/definitions/tapi.topology.ResilienceTypeWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/risk-characteristic={risk-characteristic-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.RiskCharacteristic"
@@ -2023,10 +2023,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -2048,11 +2048,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -2072,10 +2072,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2096,10 +2096,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2120,11 +2120,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2144,10 +2144,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2168,10 +2168,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -2193,11 +2193,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/link={link-uuid}/validation-mechanism={validation-mechanism}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.ValidationMechanism"
@@ -2223,10 +2223,10 @@ paths:
         200:
           description: "tapi.topology.ValidationMechanism"
           schema:
-            $ref: "#/definitions/tapi.topology.ValidationMechanism"
+            $ref: "#/definitions/tapi.topology.ValidationMechanismWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2249,10 +2249,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/:
     get:
       tags:
       - "tapi-topology"
@@ -2273,10 +2273,10 @@ paths:
         200:
           description: "tapi.topology.Node"
           schema:
-            $ref: "#/definitions/tapi.topology.Node"
+            $ref: "#/definitions/tapi.topology.NodeWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -2312,10 +2312,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -2336,10 +2336,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/:
     get:
       tags:
       - "tapi-topology"
@@ -2360,11 +2360,11 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2384,10 +2384,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2408,11 +2408,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2432,11 +2432,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -2456,10 +2456,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/available-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -2481,10 +2481,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/cost-characteristic={cost-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2511,10 +2511,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/encap-topology/:
     get:
       tags:
       - "tapi-topology"
@@ -2535,11 +2535,11 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/latency-characteristic={traffic-property-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.LatencyCharacteristic"
@@ -2565,10 +2565,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-topology"
@@ -2596,11 +2596,11 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeRuleGroup"
@@ -2625,11 +2625,11 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.Capacity"
@@ -2654,10 +2654,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -2683,10 +2683,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2712,10 +2712,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2741,10 +2741,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2770,10 +2770,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -2799,10 +2799,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -2829,10 +2829,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -2864,10 +2864,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -2900,10 +2900,10 @@ paths:
         200:
           description: "tapi.topology.InterRuleGroup"
           schema:
-            $ref: "#/definitions/tapi.topology.InterRuleGroup"
+            $ref: "#/definitions/tapi.topology.InterRuleGroupWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/associated-node-rule-group={topology-uuid},{associated-node-rule-group-node-uuid},{associated-node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -2952,10 +2952,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -2986,10 +2986,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -3020,10 +3020,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3054,10 +3054,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3088,10 +3088,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3122,10 +3122,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3156,10 +3156,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3191,10 +3191,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/cost-characteristic={cost-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3231,10 +3231,10 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3271,10 +3271,10 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3312,10 +3312,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3352,10 +3352,10 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/
   : get:
       tags:
       - "tapi-topology"
@@ -3391,10 +3391,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -3442,10 +3442,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -3483,10 +3483,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3529,10 +3529,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -3570,10 +3570,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -3605,10 +3605,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -3639,10 +3639,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3673,10 +3673,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3707,10 +3707,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3741,10 +3741,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -3775,10 +3775,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/inter-rule-group={inter-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -3810,10 +3810,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -3845,11 +3845,11 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/name={value-name}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.NameAndValue"
@@ -3881,10 +3881,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-edge-point={topology-uuid},{node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -3925,10 +3925,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/node-rule-group={topology-uuid},{node-rule-group-node-uuid},{node-rule-group-node-rule-group-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -3971,10 +3971,10 @@ paths:
         200:
           description: "tapi.topology.NodeRuleGroupRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+            $ref: "#/definitions/tapi.topology.NodeRuleGroupRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/risk-characteristic={risk-characteristic-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4006,11 +4006,11 @@ paths:
         200:
           description: "tapi.topology.RiskCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.RiskCharacteristic"
+            $ref: "#/definitions/tapi.topology.RiskCharacteristicWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.Rule"
@@ -4040,10 +4040,10 @@ paths:
         200:
           description: "tapi.topology.Rule"
           schema:
-            $ref: "#/definitions/tapi.topology.Rule"
+            $ref: "#/definitions/tapi.topology.RuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/cep-port-role/
   : get:
       tags:
       - "tapi-topology"
@@ -4086,10 +4086,10 @@ paths:
         200:
           description: "tapi.topology.PortRoleRule"
           schema:
-            $ref: "#/definitions/tapi.topology.PortRoleRule"
+            $ref: "#/definitions/tapi.topology.PortRoleRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/connection-spec-reference/
   : get:
       tags:
       - "tapi-topology"
@@ -4122,10 +4122,10 @@ paths:
         200:
           description: "tapi.topology.ConnectionSpecReference"
           schema:
-            $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
+            $ref: "#/definitions/tapi.topology.ConnectionSpecReferenceWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4163,10 +4163,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/rule={local-id}/signal-property/
   : get:
       tags:
       - "tapi-topology"
@@ -4199,10 +4199,10 @@ paths:
         200:
           description: "tapi.topology.SignalPropertyRule"
           schema:
-            $ref: "#/definitions/tapi.topology.SignalPropertyRule"
+            $ref: "#/definitions/tapi.topology.SignalPropertyRuleWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4229,10 +4229,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4258,10 +4258,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4287,10 +4287,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4316,10 +4316,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4345,10 +4345,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4374,10 +4374,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/node-rule-group={node-rule-group-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4404,11 +4404,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.topology.NodeEdgePoint"
@@ -4433,10 +4433,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePoint"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePoint"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/aggregated-node-edge-point={topology-uuid},{aggregated-node-edge-point-node-uuid},{node-edge-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4477,10 +4477,10 @@ paths:
         200:
           description: "tapi.topology.NodeEdgePointRef"
           schema:
-            $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+            $ref: "#/definitions/tapi.topology.NodeEdgePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4506,10 +4506,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4535,10 +4535,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4564,10 +4564,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4593,10 +4593,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4622,10 +4622,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4651,10 +4651,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/available-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4681,10 +4681,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/mapped-service-interface-point={service-interface-point-uuid}/
   : get:
       tags:
       - "tapi-topology"
@@ -4717,10 +4717,10 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/name={value-name}/
   : get:
       tags:
       - "tapi-topology"
@@ -4753,10 +4753,10 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/
   : get:
       tags:
       - "tapi-topology"
@@ -4783,10 +4783,10 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/
   : get:
       tags:
       - "tapi-topology"
@@ -4812,10 +4812,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4841,10 +4841,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4870,10 +4870,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4899,10 +4899,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -4928,10 +4928,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/owned-node-edge-point={owned-node-edge-point-uuid}/total-potential-capacity/total-size/
   : get:
       tags:
       - "tapi-topology"
@@ -4958,10 +4958,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/:
     get:
       tags:
       - "tapi-topology"
@@ -4983,11 +4983,11 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.BandwidthProfile"
@@ -5007,10 +5007,10 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-topology"
@@ -5031,10 +5031,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5055,11 +5055,11 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/:
-    get:
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-burst-size/
+  : get:
       tags:
       - "tapi-topology"
       summary: "returns tapi.common.CapacityValue"
@@ -5079,10 +5079,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  ? /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-topology"
@@ -5103,10 +5103,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
+  /data/tapi-common:context/tapi-topology:topology-context/topology={uuid}/node={node-uuid}/total-potential-capacity/total-size/:
     get:
       tags:
       - "tapi-topology"
@@ -5128,10 +5128,10 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5142,7 +5142,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkContext"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContextWrapper"
         400:
           description: "Internal error"
     post:
@@ -5156,7 +5156,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkContext to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -5175,7 +5175,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkContext to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContextWrapper"
       responses:
         201:
           description: "Object created"
@@ -5194,7 +5194,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -5206,7 +5206,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkService to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -5214,7 +5214,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5230,7 +5230,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkService"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceWrapper"
         400:
           description: "Internal error"
     put:
@@ -5249,7 +5249,7 @@ paths:
         description: "tapi.virtual.network.VirtualNetworkService to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceWrapper"
       responses:
         201:
           description: "Object created"
@@ -5273,7 +5273,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -5291,7 +5291,7 @@ paths:
           \ to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -5299,7 +5299,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5320,7 +5320,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkServiceEndPoint"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPointWrapper"
         400:
           description: "Internal error"
     put:
@@ -5345,7 +5345,7 @@ paths:
           \ or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPointWrapper"
       responses:
         201:
           description: "Object created"
@@ -5374,7 +5374,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -5398,7 +5398,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5406,8 +5406,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.NameAndValue"
@@ -5434,7 +5434,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5465,7 +5465,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5501,8 +5501,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/service-interface-point/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/end-point={local-id}/service-interface-point/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -5522,10 +5522,10 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/name/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/name/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -5544,7 +5544,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5552,7 +5552,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/name={value-name}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/name={value-name}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5575,7 +5575,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -5601,7 +5601,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -5632,7 +5632,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/schedule/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/schedule/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5648,7 +5648,7 @@ paths:
         200:
           description: "tapi.common.TimeRange"
           schema:
-            $ref: "#/definitions/tapi.common.TimeRange"
+            $ref: "#/definitions/tapi.common.TimeRangeWrapper"
         400:
           description: "Internal error"
     post:
@@ -5667,7 +5667,7 @@ paths:
         description: "tapi.common.TimeRange to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -5691,7 +5691,7 @@ paths:
         description: "tapi.common.TimeRange to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.TimeRange"
+          $ref: "#/definitions/tapi.common.TimeRangeWrapper"
       responses:
         201:
           description: "Object created"
@@ -5715,7 +5715,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/state/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/state/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5731,7 +5731,7 @@ paths:
         200:
           description: "tapi.common.AdminStatePac"
           schema:
-            $ref: "#/definitions/tapi.common.AdminStatePac"
+            $ref: "#/definitions/tapi.common.AdminStatePacWrapper"
         400:
           description: "Internal error"
     post:
@@ -5750,7 +5750,7 @@ paths:
         description: "tapi.common.AdminStatePac to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.AdminStatePac"
+          $ref: "#/definitions/tapi.common.AdminStatePacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5774,7 +5774,7 @@ paths:
         description: "tapi.common.AdminStatePac to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.AdminStatePac"
+          $ref: "#/definitions/tapi.common.AdminStatePacWrapper"
       responses:
         201:
           description: "Object created"
@@ -5798,7 +5798,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/topology/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/topology/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5814,10 +5814,10 @@ paths:
         200:
           description: "tapi.topology.TopologyRef"
           schema:
-            $ref: "#/definitions/tapi.topology.TopologyRef"
+            $ref: "#/definitions/tapi.topology.TopologyRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint/:
     post:
       tags:
       - "tapi-virtual-network"
@@ -5835,7 +5835,7 @@ paths:
           \ list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -5843,7 +5843,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/:
+  /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/:
     get:
       tags:
       - "tapi-virtual-network"
@@ -5864,7 +5864,7 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNetworkConstraint"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraintWrapper"
         400:
           description: "Internal error"
     put:
@@ -5889,7 +5889,7 @@ paths:
           \ updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
+          $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraintWrapper"
       responses:
         201:
           description: "Object created"
@@ -5918,8 +5918,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic/
+  : post:
       tags:
       - "tapi-virtual-network"
       summary: "creates tapi.topology.CostCharacteristic"
@@ -5941,7 +5941,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -5949,8 +5949,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic={cost-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/cost-characteristic={cost-name}/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.topology.CostCharacteristic"
@@ -5976,7 +5976,7 @@ paths:
         200:
           description: "tapi.topology.CostCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.CostCharacteristic"
+            $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -6006,7 +6006,7 @@ paths:
         description: "tapi.topology.CostCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.CostCharacteristic"
+          $ref: "#/definitions/tapi.topology.CostCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -6041,7 +6041,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/diversity-exclusion={virtual-nw-service-uuid}/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/diversity-exclusion={virtual-nw-service-uuid}/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -6067,11 +6067,11 @@ paths:
         200:
           description: "tapi.virtual.network.VirtualNwServiceRef"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.VirtualNwServiceRef"
+            $ref: "#/definitions/tapi.virtual.network.VirtualNwServiceRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic/:
-    post:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic/
+  : post:
       tags:
       - "tapi-virtual-network"
       summary: "creates tapi.topology.LatencyCharacteristic"
@@ -6093,7 +6093,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -6101,7 +6101,7 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic={traffic-property-name}/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/latency-characteristic={traffic-property-name}/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -6128,7 +6128,7 @@ paths:
         200:
           description: "tapi.topology.LatencyCharacteristic"
           schema:
-            $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+            $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
         400:
           description: "Internal error"
     put:
@@ -6158,7 +6158,7 @@ paths:
         description: "tapi.topology.LatencyCharacteristic to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
+          $ref: "#/definitions/tapi.topology.LatencyCharacteristicWrapper"
       responses:
         201:
           description: "Object created"
@@ -6193,8 +6193,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name/:
-    post:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name/
+  : post:
       tags:
       - "tapi-virtual-network"
       summary: "creates tapi.common.NameAndValue"
@@ -6217,7 +6217,7 @@ paths:
         description: "tapi.common.NameAndValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6225,8 +6225,8 @@ paths:
           description: "Internal error"
         409:
           description: "Object already exists"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name={value-name}/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/name={value-name}/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.NameAndValue"
@@ -6253,7 +6253,7 @@ paths:
         200:
           description: "tapi.common.NameAndValue"
           schema:
-            $ref: "#/definitions/tapi.common.NameAndValue"
+            $ref: "#/definitions/tapi.common.NameAndValueWrapper"
         400:
           description: "Internal error"
     put:
@@ -6284,7 +6284,7 @@ paths:
         description: "tapi.common.NameAndValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.NameAndValue"
+          $ref: "#/definitions/tapi.common.NameAndValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6320,8 +6320,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.Capacity"
@@ -6341,7 +6341,7 @@ paths:
         200:
           description: "tapi.common.Capacity"
           schema:
-            $ref: "#/definitions/tapi.common.Capacity"
+            $ref: "#/definitions/tapi.common.CapacityWrapper"
         400:
           description: "Internal error"
     post:
@@ -6365,7 +6365,7 @@ paths:
         description: "tapi.common.Capacity to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -6394,7 +6394,7 @@ paths:
         description: "tapi.common.Capacity to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.Capacity"
+          $ref: "#/definitions/tapi.common.CapacityWrapper"
       responses:
         201:
           description: "Object created"
@@ -6423,8 +6423,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.BandwidthProfile"
@@ -6444,7 +6444,7 @@ paths:
         200:
           description: "tapi.common.BandwidthProfile"
           schema:
-            $ref: "#/definitions/tapi.common.BandwidthProfile"
+            $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
         400:
           description: "Internal error"
     post:
@@ -6468,7 +6468,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -6497,7 +6497,7 @@ paths:
         description: "tapi.common.BandwidthProfile to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.BandwidthProfile"
+          $ref: "#/definitions/tapi.common.BandwidthProfileWrapper"
       responses:
         201:
           description: "Object created"
@@ -6526,7 +6526,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-burst-size/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-burst-size/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -6547,7 +6547,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -6571,7 +6571,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6600,7 +6600,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6629,7 +6629,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-information-rate/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/committed-information-rate/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -6650,7 +6650,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -6674,7 +6674,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6703,7 +6703,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6732,7 +6732,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-burst-size/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-burst-size/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -6753,7 +6753,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -6777,7 +6777,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6806,7 +6806,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6835,7 +6835,7 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  ? /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-information-rate/
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/bandwidth-profile/peak-information-rate/
   : get:
       tags:
       - "tapi-virtual-network"
@@ -6856,7 +6856,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -6880,7 +6880,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6909,7 +6909,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -6938,8 +6938,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/total-size/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/requested-capacity/total-size/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.CapacityValue"
@@ -6960,7 +6960,7 @@ paths:
         200:
           description: "tapi.common.CapacityValue"
           schema:
-            $ref: "#/definitions/tapi.common.CapacityValue"
+            $ref: "#/definitions/tapi.common.CapacityValueWrapper"
         400:
           description: "Internal error"
     post:
@@ -6985,7 +6985,7 @@ paths:
         description: "tapi.common.CapacityValue to be added to list"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7015,7 +7015,7 @@ paths:
         description: "tapi.common.CapacityValue to be added or updated"
         required: false
         schema:
-          $ref: "#/definitions/tapi.common.CapacityValue"
+          $ref: "#/definitions/tapi.common.CapacityValueWrapper"
       responses:
         201:
           description: "Object created"
@@ -7045,8 +7045,8 @@ paths:
           description: "Internal error"
         204:
           description: "Object deleted"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/sink-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/sink-service-end-point/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -7066,11 +7066,11 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  /data/context/virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/src-service-end-point/:
-    get:
+  ? /data/tapi-common:context/tapi-virtual-network:virtual-network-context/virtual-nw-service={uuid}/vnw-constraint={local-id}/src-service-end-point/
+  : get:
       tags:
       - "tapi-virtual-network"
       summary: "returns tapi.common.ServiceInterfacePointRef"
@@ -7090,171 +7090,112 @@ paths:
         200:
           description: "tapi.common.ServiceInterfacePointRef"
           schema:
-            $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
-        400:
-          description: "Internal error"
-  /operations/create-notification-subscription-service/:
-    post:
-      tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
-      parameters:
-      - in: "body"
-        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/create-virtual-network-service/:
-    post:
-      tags:
-      - "tapi-virtual-network"
-      summary: "operates on tapi.virtual.network.CreateVirtualNetworkService"
-      description: "operates on tapi.virtual.network.CreateVirtualNetworkService"
-      parameters:
-      - in: "body"
-        name: "tapi.virtual.network.createvirtualnetworkservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.virtual.network.createvirtualnetworkservice.Input"
-      responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.virtual.network.CreateVirtualNetworkService"
-        201:
-          description: "No response"
+            $ref: "#/definitions/tapi.common.ServiceInterfacePointRefWrapper"
         400:
           description: "Internal error"
-  /operations/delete-notification-subscription-service/:
+  /operations/tapi-common:get-service-interface-point-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
-      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      - "tapi-common"
+      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
+      description: "operates on tapi.common.GetServiceInterfacePointDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
-        201:
-          description: "No response"
-        400:
-          description: "Internal error"
-  /operations/delete-virtual-network-service/:
-    post:
-      tags:
-      - "tapi-virtual-network"
-      summary: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
-      description: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
-      parameters:
-      - in: "body"
-        name: "tapi.virtual.network.deletevirtualnetworkservice.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.virtual.network.deletevirtualnetworkservice.Input"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-common:get-service-interface-point-list/:
+    post:
+      tags:
+      - "tapi-common"
+      parameters: []
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.DeleteVirtualNetworkService"
+            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-link-details/:
+  /operations/tapi-common:update-service-interface-point/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetLinkDetails"
-      description: "operates on tapi.topology.GetLinkDetails"
+      - "tapi-common"
+      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
+      description: "operates on tapi.common.UpdateServiceInterfacePoint"
       parameters:
       - in: "body"
-        name: "tapi.topology.getlinkdetails.Input.body-param"
+        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
+              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
       responses:
-        200:
-          description: "Correct response"
-          schema:
-            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-details/:
+  /operations/tapi-notification:create-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeDetails"
-      description: "operates on tapi.topology.GetNodeDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.CreateNotificationSubscriptionService"
+      description: "operates on tapi.notification.CreateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodedetails.Input.body-param"
+        name: "tapi.notification.createnotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
+              $ref: "#/definitions/tapi.notification.createnotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+            $ref: "#/definitions/tapi.notification.CreateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-node-edge-point-details/:
+  /operations/tapi-notification:delete-notification-subscription-service/:
     post:
       tags:
-      - "tapi-topology"
-      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
-      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      - "tapi-notification"
+      summary: "operates on tapi.notification.DeleteNotificationSubscriptionService"
+      description: "operates on tapi.notification.DeleteNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        name: "tapi.notification.deletenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.deletenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
+            $ref: "#/definitions/tapi.notification.DeleteNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-list/:
+  /operations/tapi-notification:get-notification-list/:
     post:
       tags:
       - "tapi-notification"
@@ -7277,7 +7218,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-details/:
+  /operations/tapi-notification:get-notification-subscription-service-details/:
     post:
       tags:
       - "tapi-notification"
@@ -7300,7 +7241,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-notification-subscription-service-list/:
+  /operations/tapi-notification:get-notification-subscription-service-list/:
     post:
       tags:
       - "tapi-notification"
@@ -7314,58 +7255,113 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-details/:
+  /operations/tapi-notification:get-supported-notification-types/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.GetServiceInterfacePointDetails"
-      description: "operates on tapi.common.GetServiceInterfacePointDetails"
+      - "tapi-notification"
+      parameters: []
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-notification:update-notification-subscription-service/:
+    post:
+      tags:
+      - "tapi-notification"
+      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
       parameters:
       - in: "body"
-        name: "tapi.common.getserviceinterfacepointdetails.Input.body-param"
+        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.common.getserviceinterfacepointdetails.Input"
+              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointDetails"
+            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-service-interface-point-list/:
+  /operations/tapi-topology:get-link-details/:
     post:
       tags:
-      - "tapi-common"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetLinkDetails"
+      description: "operates on tapi.topology.GetLinkDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getlinkdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getlinkdetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.common.GetServiceInterfacePointList"
+            $ref: "#/definitions/tapi.topology.GetLinkDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-supported-notification-types/:
+  /operations/tapi-topology:get-node-details/:
     post:
       tags:
-      - "tapi-notification"
-      parameters: []
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeDetails"
+      description: "operates on tapi.topology.GetNodeDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodedetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.GetSupportedNotificationTypes"
+            $ref: "#/definitions/tapi.topology.GetNodeDetails"
+        201:
+          description: "No response"
+        400:
+          description: "Internal error"
+  /operations/tapi-topology:get-node-edge-point-details/:
+    post:
+      tags:
+      - "tapi-topology"
+      summary: "operates on tapi.topology.GetNodeEdgePointDetails"
+      description: "operates on tapi.topology.GetNodeEdgePointDetails"
+      parameters:
+      - in: "body"
+        name: "tapi.topology.getnodeedgepointdetails.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.topology.getnodeedgepointdetails.Input"
+      responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.topology.GetNodeEdgePointDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-details/:
+  /operations/tapi-topology:get-topology-details/:
     post:
       tags:
       - "tapi-topology"
@@ -7388,7 +7384,7 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-topology-list/:
+  /operations/tapi-topology:get-topology-list/:
     post:
       tags:
       - "tapi-topology"
@@ -7402,81 +7398,85 @@ paths:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-virtual-network-service-details/:
+  /operations/tapi-virtual-network:create-virtual-network-service/:
     post:
       tags:
       - "tapi-virtual-network"
-      summary: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
-      description: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
+      summary: "operates on tapi.virtual.network.CreateVirtualNetworkService"
+      description: "operates on tapi.virtual.network.CreateVirtualNetworkService"
       parameters:
       - in: "body"
-        name: "tapi.virtual.network.getvirtualnetworkservicedetails.Input.body-param"
+        name: "tapi.virtual.network.createvirtualnetworkservice.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.virtual.network.getvirtualnetworkservicedetails.Input"
+              $ref: "#/definitions/tapi.virtual.network.createvirtualnetworkservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceDetails"
+            $ref: "#/definitions/tapi.virtual.network.CreateVirtualNetworkService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/get-virtual-network-service-list/:
+  /operations/tapi-virtual-network:delete-virtual-network-service/:
     post:
       tags:
       - "tapi-virtual-network"
-      parameters: []
+      summary: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
+      description: "operates on tapi.virtual.network.DeleteVirtualNetworkService"
+      parameters:
+      - in: "body"
+        name: "tapi.virtual.network.deletevirtualnetworkservice.Input.body-param"
+        required: false
+        schema:
+          properties:
+            input:
+              $ref: "#/definitions/tapi.virtual.network.deletevirtualnetworkservice.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceList"
+            $ref: "#/definitions/tapi.virtual.network.DeleteVirtualNetworkService"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-notification-subscription-service/:
+  /operations/tapi-virtual-network:get-virtual-network-service-details/:
     post:
       tags:
-      - "tapi-notification"
-      summary: "operates on tapi.notification.UpdateNotificationSubscriptionService"
-      description: "operates on tapi.notification.UpdateNotificationSubscriptionService"
+      - "tapi-virtual-network"
+      summary: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
+      description: "operates on tapi.virtual.network.GetVirtualNetworkServiceDetails"
       parameters:
       - in: "body"
-        name: "tapi.notification.updatenotificationsubscriptionservice.Input.body-param"
+        name: "tapi.virtual.network.getvirtualnetworkservicedetails.Input.body-param"
         required: false
         schema:
           properties:
             input:
-              $ref: "#/definitions/tapi.notification.updatenotificationsubscriptionservice.Input"
+              $ref: "#/definitions/tapi.virtual.network.getvirtualnetworkservicedetails.Input"
       responses:
         200:
           description: "Correct response"
           schema:
-            $ref: "#/definitions/tapi.notification.UpdateNotificationSubscriptionService"
+            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceDetails"
         201:
           description: "No response"
         400:
           description: "Internal error"
-  /operations/update-service-interface-point/:
+  /operations/tapi-virtual-network:get-virtual-network-service-list/:
     post:
       tags:
-      - "tapi-common"
-      summary: "operates on tapi.common.UpdateServiceInterfacePoint"
-      description: "operates on tapi.common.UpdateServiceInterfacePoint"
-      parameters:
-      - in: "body"
-        name: "tapi.common.updateserviceinterfacepoint.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              $ref: "#/definitions/tapi.common.updateserviceinterfacepoint.Input"
+      - "tapi-virtual-network"
+      parameters: []
       responses:
+        200:
+          description: "Correct response"
+          schema:
+            $ref: "#/definitions/tapi.virtual.network.GetVirtualNetworkServiceList"
         201:
           description: "No response"
         400:
@@ -7494,6 +7494,10 @@ definitions:
       administrative-state:
         description: "none"
         $ref: "#/definitions/tapi.common.AdministrativeState"
+  tapi.common.AdminStatePacWrapper:
+    properties:
+      state:
+        $ref: "#/definitions/tapi.common.AdminStatePac"
   tapi.common.AdministrativeState:
     type: "string"
     enum:
@@ -7532,6 +7536,10 @@ definitions:
     - "RFC_2697"
     - "RFC_2698"
     - "RFC_4115"
+  tapi.common.BandwidthProfileWrapper:
+    properties:
+      bandwidth-profile:
+        $ref: "#/definitions/tapi.common.BandwidthProfile"
   tapi.common.Capacity:
     type: "object"
     properties:
@@ -7575,12 +7583,24 @@ definitions:
       unit:
         description: "none"
         $ref: "#/definitions/tapi.common.CapacityUnit"
+  tapi.common.CapacityValueWrapper:
+    properties:
+      committed-burst-size:
+        $ref: "#/definitions/tapi.common.CapacityValue"
+  tapi.common.CapacityWrapper:
+    properties:
+      available-capacity:
+        $ref: "#/definitions/tapi.common.Capacity"
   tapi.common.Context:
     allOf:
     - $ref: "#/definitions/tapi.common.TapiContext"
     - $ref: "#/definitions/tapi.notification.ContextAugmentation1"
     - $ref: "#/definitions/tapi.topology.ContextAugmentation3"
     - $ref: "#/definitions/tapi.virtual.network.ContextAugmentation2"
+  tapi.common.ContextWrapper:
+    properties:
+      tapi-common:context:
+        $ref: "#/definitions/tapi.common.Context"
   tapi.common.ForwardingDirection:
     type: "string"
     enum:
@@ -7654,6 +7674,10 @@ definitions:
       value:
         type: "string"
         description: "The value"
+  tapi.common.NameAndValueWrapper:
+    properties:
+      name:
+        $ref: "#/definitions/tapi.common.NameAndValue"
   tapi.common.OperationalState:
     type: "string"
     enum:
@@ -7705,6 +7729,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid"
+  tapi.common.ServiceInterfacePointRefWrapper:
+    properties:
+      mapped-service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePointRef"
+  tapi.common.ServiceInterfacePointWrapper:
+    properties:
+      service-interface-point:
+        $ref: "#/definitions/tapi.common.ServiceInterfacePoint"
   tapi.common.TapiContext:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7758,6 +7790,10 @@ definitions:
       start-time:
         type: "string"
         description: "none"
+  tapi.common.TimeRangeWrapper:
+    properties:
+      schedule:
+        $ref: "#/definitions/tapi.common.TimeRange"
   tapi.common.getserviceinterfacepointdetails.Input:
     type: "object"
     properties:
@@ -7803,6 +7839,10 @@ definitions:
         type: "boolean"
         description: "none"
         default: false
+  tapi.notification.AlarmInfoWrapper:
+    properties:
+      alarm-info:
+        $ref: "#/definitions/tapi.notification.AlarmInfo"
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
@@ -7854,6 +7894,10 @@ definitions:
       new-value:
         type: "string"
         description: "The value"
+  tapi.notification.NameAndValueChangeWrapper:
+    properties:
+      changed-attributes:
+        $ref: "#/definitions/tapi.notification.NameAndValueChange"
   tapi.notification.Notification:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7926,6 +7970,10 @@ definitions:
             \ of this is typically dependent on the implementation protocol & mechanism\
             \ and hence is typed as a string."
       description: "none"
+  tapi.notification.NotificationChannelWrapper:
+    properties:
+      notification-channel:
+        $ref: "#/definitions/tapi.notification.NotificationChannel"
   tapi.notification.NotificationContext:
     type: "object"
     properties:
@@ -7939,6 +7987,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.notification.Notification"
+  tapi.notification.NotificationContextWrapper:
+    properties:
+      tapi-notification:notification-context:
+        $ref: "#/definitions/tapi.notification.NotificationContext"
   tapi.notification.NotificationSubscriptionService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -7969,6 +8021,10 @@ definitions:
           description: "none"
           $ref: "#/definitions/tapi.notification.SubscriptionFilter"
       description: "none"
+  tapi.notification.NotificationSubscriptionServiceWrapper:
+    properties:
+      notif-subscription:
+        $ref: "#/definitions/tapi.notification.NotificationSubscriptionService"
   tapi.notification.NotificationType:
     type: "string"
     enum:
@@ -7977,6 +8033,10 @@ definitions:
     - "ATTRIBUTE_VALUE_CHANGE"
     - "ALARM_EVENT"
     - "THRESHOLD_CROSSING_ALERT"
+  tapi.notification.NotificationWrapper:
+    properties:
+      notification:
+        $ref: "#/definitions/tapi.notification.Notification"
   tapi.notification.ObjectType:
     type: "string"
     enum:
@@ -8065,6 +8125,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.notification.ObjectType"
       description: "none"
+  tapi.notification.SubscriptionFilterWrapper:
+    properties:
+      subscription-filter:
+        $ref: "#/definitions/tapi.notification.SubscriptionFilter"
   tapi.notification.SubscriptionState:
     type: "string"
     enum:
@@ -8097,6 +8161,10 @@ definitions:
       measurement-interval:
         type: "string"
         description: "none"
+  tapi.notification.TcaInfoWrapper:
+    properties:
+      tca-info:
+        $ref: "#/definitions/tapi.notification.TcaInfo"
   tapi.notification.ThresholdCrossingType:
     type: "string"
     enum:
@@ -8216,6 +8284,10 @@ definitions:
         description: "The reference to a formal spec. \r\n                This reference\
           \ need not be provided (e.g., where there is no formal machine interpretable\
           \ spec for the type of connection)."
+  tapi.topology.ConnectionSpecReferenceWrapper:
+    properties:
+      connection-spec-reference:
+        $ref: "#/definitions/tapi.topology.ConnectionSpecReference"
   tapi.topology.ContextAugmentation3:
     type: "object"
     properties:
@@ -8239,6 +8311,10 @@ definitions:
         type: "string"
         description: "The cost characteristic will related to some aspect of the TopologicalEntity\
           \ (e.g. $ cost, routing weight). This aspect will be conveyed by the costName."
+  tapi.topology.CostCharacteristicWrapper:
+    properties:
+      cost-characteristic:
+        $ref: "#/definitions/tapi.topology.CostCharacteristic"
   tapi.topology.ForwardingRule:
     type: "string"
     enum:
@@ -8295,6 +8371,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.Rule"
       description: "Rules that apply between groups of NEPs."
+  tapi.topology.InterRuleGroupWrapper:
+    properties:
+      inter-rule-group:
+        $ref: "#/definitions/tapi.topology.InterRuleGroup"
   tapi.topology.LatencyCharacteristic:
     type: "object"
     properties:
@@ -8321,6 +8401,10 @@ definitions:
       queing-latency-characteristic:
         type: "string"
         description: "The specific queuing latency for the traffic property."
+  tapi.topology.LatencyCharacteristicWrapper:
+    properties:
+      latency-characteristic:
+        $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
   tapi.topology.LayerProtocolTransitionPac:
     type: "object"
     properties:
@@ -8365,6 +8449,10 @@ definitions:
           $ref: "#/definitions/tapi.common.ForwardingDirection"
       description: "The Link object class models effective adjacency between two or\
         \ more ForwardingDomains (FD). "
+  tapi.topology.LinkWrapper:
+    properties:
+      link:
+        $ref: "#/definitions/tapi.topology.Link"
   tapi.topology.NetworkTopologyService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8376,6 +8464,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.TopologyRef"
       description: "none"
+  tapi.topology.NetworkTopologyServiceWrapper:
+    properties:
+      nw-topology-service:
+        $ref: "#/definitions/tapi.topology.NetworkTopologyService"
   tapi.topology.Node:
     allOf:
     - $ref: "#/definitions/tapi.common.AdminStatePac"
@@ -8465,6 +8557,14 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeEdgePointRefWrapper:
+    properties:
+      node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePointRef"
+  tapi.topology.NodeEdgePointWrapper:
+    properties:
+      owned-node-edge-point:
+        $ref: "#/definitions/tapi.topology.NodeEdgePoint"
   tapi.topology.NodeRef:
     allOf:
     - $ref: "#/definitions/tapi.topology.TopologyRef"
@@ -8520,6 +8620,18 @@ definitions:
           description: "none"
           x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid"
       description: "none"
+  tapi.topology.NodeRuleGroupRefWrapper:
+    properties:
+      associated-node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroupRef"
+  tapi.topology.NodeRuleGroupWrapper:
+    properties:
+      node-rule-group:
+        $ref: "#/definitions/tapi.topology.NodeRuleGroup"
+  tapi.topology.NodeWrapper:
+    properties:
+      node:
+        $ref: "#/definitions/tapi.topology.Node"
   tapi.topology.PortRoleRule:
     type: "object"
     properties:
@@ -8542,6 +8654,10 @@ definitions:
         description: "The role(s) of the port(s) considered in the rule."
         items:
           type: "string"
+  tapi.topology.PortRoleRuleWrapper:
+    properties:
+      cep-port-role:
+        $ref: "#/definitions/tapi.topology.PortRoleRule"
   tapi.topology.ProtectionType:
     type: "string"
     enum:
@@ -8562,6 +8678,10 @@ definitions:
       protection-type:
         description: "none"
         $ref: "#/definitions/tapi.topology.ProtectionType"
+  tapi.topology.ResilienceTypeWrapper:
+    properties:
+      resilience-type:
+        $ref: "#/definitions/tapi.topology.ResilienceType"
   tapi.topology.RestorationPolicy:
     type: "string"
     enum:
@@ -8587,6 +8707,10 @@ definitions:
           \ TopologicalEntity."
         items:
           type: "string"
+  tapi.topology.RiskCharacteristicWrapper:
+    properties:
+      risk-characteristic:
+        $ref: "#/definitions/tapi.topology.RiskCharacteristic"
   tapi.topology.RiskParameterPac:
     type: "object"
     properties:
@@ -8701,6 +8825,10 @@ definitions:
     - "TIMING"
     - "RISK"
     - "GROUPING"
+  tapi.topology.RuleWrapper:
+    properties:
+      rule:
+        $ref: "#/definitions/tapi.topology.Rule"
   tapi.topology.SignalPropertyRule:
     type: "object"
     properties:
@@ -8720,6 +8848,10 @@ definitions:
       signal-property-name:
         type: "string"
         description: "The name of the signal property to which the rule applies."
+  tapi.topology.SignalPropertyRuleWrapper:
+    properties:
+      signal-property:
+        $ref: "#/definitions/tapi.topology.SignalPropertyRule"
   tapi.topology.Topology:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -8757,6 +8889,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.topology.Topology"
+  tapi.topology.TopologyContextWrapper:
+    properties:
+      tapi-topology:topology-context:
+        $ref: "#/definitions/tapi.topology.TopologyContext"
   tapi.topology.TopologyRef:
     type: "object"
     properties:
@@ -8764,6 +8900,14 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid"
+  tapi.topology.TopologyRefWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.TopologyRef"
+  tapi.topology.TopologyWrapper:
+    properties:
+      topology:
+        $ref: "#/definitions/tapi.topology.Topology"
   tapi.topology.TransferCostPac:
     type: "object"
     properties:
@@ -8829,6 +8973,10 @@ definitions:
         type: "string"
         description: "Quality of validation (i.e. how likely is the stated validation\
           \ to be invalid)"
+  tapi.topology.ValidationMechanismWrapper:
+    properties:
+      validation-mechanism:
+        $ref: "#/definitions/tapi.topology.ValidationMechanism"
   tapi.topology.ValidationPac:
     type: "object"
     properties:
@@ -8977,6 +9125,10 @@ definitions:
           items:
             $ref: "#/definitions/tapi.topology.LatencyCharacteristic"
       description: "none"
+  tapi.virtual.network.VirtualNetworkConstraintWrapper:
+    properties:
+      vnw-constraint:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkConstraint"
   tapi.virtual.network.VirtualNetworkContext:
     type: "object"
     properties:
@@ -8985,6 +9137,10 @@ definitions:
         description: "none"
         items:
           $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
+  tapi.virtual.network.VirtualNetworkContextWrapper:
+    properties:
+      tapi-virtual-network:virtual-network-context:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
   tapi.virtual.network.VirtualNetworkService:
     allOf:
     - $ref: "#/definitions/tapi.common.GlobalClass"
@@ -9048,6 +9204,14 @@ definitions:
         \ the Protection Unit of a traditional protection model. \r\n            The\
         \ ForwadingConstruct can be considered as a component and the EndPoint as\
         \ a Port on that component"
+  tapi.virtual.network.VirtualNetworkServiceEndPointWrapper:
+    properties:
+      end-point:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkServiceEndPoint"
+  tapi.virtual.network.VirtualNetworkServiceWrapper:
+    properties:
+      virtual-nw-service:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNetworkService"
   tapi.virtual.network.VirtualNwServiceRef:
     type: "object"
     properties:
@@ -9055,6 +9219,10 @@ definitions:
         type: "string"
         description: "none"
         x-path: "/tapi-common:context/tapi-virtual-network:virtual-network-context/tapi-virtual-network:virtual-nw-service/tapi-virtual-network:uuid"
+  tapi.virtual.network.VirtualNwServiceRefWrapper:
+    properties:
+      diversity-exclusion:
+        $ref: "#/definitions/tapi.virtual.network.VirtualNwServiceRef"
   tapi.virtual.network.createvirtualnetworkservice.Input:
     type: "object"
     properties:
diff --git a/UML/TapiConnectivity.notation b/UML/TapiConnectivity.notation
index 177f0a80..6197d21f 100644
--- a/UML/TapiConnectivity.notation
+++ b/UML/TapiConnectivity.notation
@@ -1,642 +1,642 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_vmgeMDBFEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="ConnectivityServiceDetails" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_0G9yhzBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_0G9yiDBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_0G9yiTBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0G9yijBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0G9yizBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_Ygt4EK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_4Es8M2kIEeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygt4Ea1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygt4Eq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_4EtL4EUcEeWEwNCluy4jrw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygt4E61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-sK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_WFu44u_qEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-sa1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-sq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_Wuyu0q1bEeiIjuV0HZnJAQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-s61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-tK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_TyD6Qv4yEea_VPdGG2-szQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-ta1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-tq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MKK0kIfWEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-t61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-uK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nfDxo-_pEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-ua1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-vK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-va1eEeiIjuV0HZnJAQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Ygz-vq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Ygz-v61eEeiIjuV0HZnJAQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0G9zbDBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0G9zbTBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G9zbjBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zbzBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0G9zcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0G9zcTBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0G9zcjBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G9zczBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zdDBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0G9zdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0G9zdjBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0G9zdzBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G9zeDBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zeTBFEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G9zpzBFEeam35bpdXJzEw" x="222" y="56" width="298" height="186"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_0G91jDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_0G91jTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_0G91jjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0G91jzBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0G91kDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_TfFtEK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_Hk2vsK1lEeiqCPid09Hqfw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtEa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtEq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_lY2XULvZEeWYrqoqXLgguw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtE61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtFK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_3bhE4L2BEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtFa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtFq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_-YtW8L11EeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtF61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtGK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_caIFkNnlEeWIOYiRCk5bbQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtGa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtGq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ru76gGNFEee0bPnI-Gt-mQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtG61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtHK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_l8TgscF3EeaALJQAf08uAg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtHa1lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TfFtHq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_wt-RckXOEeaB8vMnkFQLXQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TfFtH61lEeiqCPid09Hqfw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_IDjM0G2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_snvNYW2pEeqjr-4srHPKHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_IDjM0W2rEeqjr-4srHPKHw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_IGelAG2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_SqFjIm2qEeqjr-4srHPKHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_IGelAW2rEeqjr-4srHPKHw"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0G928TBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0G928jBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G928zBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G929DBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0G929TBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0G929jBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0G929zBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G92-DBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G92-TBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0G92-jBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0G92-zBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0G92_DBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0G92_TBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G92_jBFEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0G93LDBFEeam35bpdXJzEw" x="200" y="-300" width="421" height="301"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_0HHioDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_0HHioTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_0HHiojBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHiozBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHipDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_TBEu8KSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBEu8aSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBFWAKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ihp2oUwPEeewALXL7BvPYw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWAaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBFWAqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sWmP8J_BEeiO_KvaRsULdw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWA6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBFWBKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWBaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBFWBqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBFWB6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBF9EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9EaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBF9EqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9E6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBF9FKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9FaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBF9FqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9F6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_TBF9GKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_TBF9GaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_ElhScHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_EeCKYHJbEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_ElhScXJbEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHjbDBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHjbTBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHjbjBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjbzBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHjcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHjcTBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHjcjBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHjczBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjdDBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHjdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHjdjBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHjdzBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHjeDBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjeTBFEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHjpzBFEeam35bpdXJzEw" x="719" y="220" width="362" height="321"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_0HHjqDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_0HHjqTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_0HHjqjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHjqzBFEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHjrDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_0HHjrTBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHj0zBFEeam35bpdXJzEw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_0HHj1DBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHj8zBFEeam35bpdXJzEw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_1F-OIP42Eea_VPdGG2-szQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_1F-OIf42Eea_VPdGG2-szQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHj9DBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHj9TBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHj9jBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHj9zBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHj-DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHj-TBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHj-jBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHj-zBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHj_DBFEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHj_TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHj_jBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHj_zBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHkADBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHkATBFEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHkLzBFEeam35bpdXJzEw" x="718" y="13" width="304" height="95"/>
+    <children xmi:type="notation:Shape" xmi:id="_0G9yhzBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0G9yiDBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0G9yiTBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0G9yijBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0G9yizBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_Ygt4EK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4Es8M2kIEeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygt4Ea1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygt4Eq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4EtL4EUcEeWEwNCluy4jrw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygt4E61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-sK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_WFu44u_qEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-sa1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-sq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Wuyu0q1bEeiIjuV0HZnJAQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-s61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-tK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TyD6Qv4yEea_VPdGG2-szQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-ta1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-tq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MKK0kIfWEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-t61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-uK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nfDxo-_pEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-ua1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-vK1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-va1eEeiIjuV0HZnJAQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ygz-vq1eEeiIjuV0HZnJAQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ygz-v61eEeiIjuV0HZnJAQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0G9zbDBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0G9zbTBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G9zbjBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zbzBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0G9zcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0G9zcTBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0G9zcjBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G9zczBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zdDBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0G9zdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0G9zdjBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0G9zdzBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G9zeDBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zeTBFEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G9zpzBFEeam35bpdXJzEw" x="222" y="56" width="298" height="186"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0G91jDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0G91jTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0G91jjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0G91jzBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0G91kDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_TfFtEK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Hk2vsK1lEeiqCPid09Hqfw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtEa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtEq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_lY2XULvZEeWYrqoqXLgguw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtE61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtFK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_3bhE4L2BEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtFa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtFq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_-YtW8L11EeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtF61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtGK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_caIFkNnlEeWIOYiRCk5bbQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtGa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtGq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ru76gGNFEee0bPnI-Gt-mQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtG61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtHK1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_l8TgscF3EeaALJQAf08uAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtHa1lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TfFtHq1lEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_wt-RckXOEeaB8vMnkFQLXQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TfFtH61lEeiqCPid09Hqfw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_IDjM0G2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_snvNYW2pEeqjr-4srHPKHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_IDjM0W2rEeqjr-4srHPKHw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_IGelAG2rEeqjr-4srHPKHw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_SqFjIm2qEeqjr-4srHPKHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_IGelAW2rEeqjr-4srHPKHw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0G928TBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0G928jBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G928zBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G929DBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0G929TBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0G929jBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0G929zBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G92-DBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G92-TBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0G92-jBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0G92-zBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0G92_DBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0G92_TBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G92_jBFEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G93LDBFEeam35bpdXJzEw" x="200" y="-300" width="421" height="301"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0HHioDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0HHioTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0HHiojBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHiozBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHipDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_TBEu8KSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBEu8aSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBFWAKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ihp2oUwPEeewALXL7BvPYw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWAaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBFWAqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sWmP8J_BEeiO_KvaRsULdw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWA6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBFWBKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWBaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBFWBqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBFWB6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBF9EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9EaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBF9EqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9E6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBF9FKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9FaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBF9FqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9F6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TBF9GKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TBF9GaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ElhScHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_EeCKYHJbEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ElhScXJbEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHjbDBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHjbTBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHjbjBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjbzBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHjcDBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHjcTBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHjcjBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHjczBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjdDBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHjdTBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHjdjBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHjdzBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHjeDBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjeTBFEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHjpzBFEeam35bpdXJzEw" x="719" y="220" width="362" height="321"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0HHjqDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0HHjqTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0HHjqjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHjqzBFEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHjrDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_0HHjrTBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHj0zBFEeam35bpdXJzEw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_0HHj1DBFEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHj8zBFEeam35bpdXJzEw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1F-OIP42Eea_VPdGG2-szQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1F-OIf42Eea_VPdGG2-szQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHj9DBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHj9TBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHj9jBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHj9zBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHj-DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHj-TBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHj-jBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHj-zBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHj_DBFEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHj_TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHj_jBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHj_zBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHkADBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHkATBFEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHkLzBFEeam35bpdXJzEw" x="718" y="13" width="304" height="95"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_0HHlMDBFEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_0HHlMTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_0HHlMjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_0HHlMzBFEeam35bpdXJzEw" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_0HHlMDBFEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0HHlMTBFEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0HHlMjBFEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0HHlMzBFEeam35bpdXJzEw" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHlNDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_QrZ4EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrZ4EaSfEeiKJbr6a5Jjpg"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHlNDBFEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_QrZ4EKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrZ4EaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrafIKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafIaSfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrafIKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafIaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrafIqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafI6SfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrafIqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafI6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrafJKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_hHoP4nIzEeeSiaQ95-6r9w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafJaSfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrafJKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_hHoP4nIzEeeSiaQ95-6r9w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafJaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrafJqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafJ6SfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrafJqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafJ6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrafKKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafKaSfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrafKKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafKaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrafKqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrafK6SfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrafKqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrafK6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrbGMKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGMaSfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrbGMKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGMaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrbGMqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGM6SfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrbGMqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGM6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrbGNKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGNaSfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrbGNKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGNaSfEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QrbGNqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QrbGN6SfEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_QrbGNqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QrbGN6SfEeiKJbr6a5Jjpg"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHl3DBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHl3TBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHl3jBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHl3zBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHl3DBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHl3TBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHl3jBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHl3zBFEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHl4DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHl4TBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHl4jBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHl4zBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHl5DBFEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHl4DBFEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHl4TBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHl4jBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHl4zBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHl5DBFEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_0HHl5TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_0HHl5jBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_0HHl5zBFEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_0HHl6DBFEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHl6TBFEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0HHl5TBFEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0HHl5jBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0HHl5zBFEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0HHl6DBFEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHl6TBFEeam35bpdXJzEw"/>
       </children>
-      <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HHmFzBFEeam35bpdXJzEw" x="100" y="315" width="350" height="366"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HHmFzBFEeam35bpdXJzEw" x="100" y="315" width="350" height="366"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_0HtYijBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_0HtYizBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0HtYjTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_nfDxoO_pEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_0HtYijBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0HtYizBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0HtYjTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_nfDxoO_pEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HtYjDBFEeam35bpdXJzEw" x="222" y="15"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HtYjDBFEeam35bpdXJzEw" x="222" y="15"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_0HtY5DBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_0HtY5TBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0HtY5zBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ntHGoO_nEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_0HtY5DBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0HtY5TBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0HtY5zBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="TapiConnectivity.uml#_ntHGoO_nEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0HtY5jBFEeam35bpdXJzEw" x="222" y="15"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0HtY5jBFEeam35bpdXJzEw" x="222" y="15"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_0KiqJjBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_0KiqJzBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0KiqKTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ttEd8O_nEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_0KiqJjBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0KiqJzBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0KiqKTBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="TapiConnectivity.uml#_ttEd8O_nEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0KiqKDBFEeam35bpdXJzEw" x="729" y="16"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KiqKDBFEeam35bpdXJzEw" x="729" y="16"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_0K_WATBFEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_0K_WAjBFEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0K_WBDBFEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_0K_WATBFEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0K_WAjBFEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0K_WBDBFEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0K_WAzBFEeam35bpdXJzEw" x="747" y="-128"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0K_WAzBFEeam35bpdXJzEw" x="747" y="-128"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="__WkxFDIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="__WkxFTIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__WkxFzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="__WkxFDIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__WkxFTIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__WkxFzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="ecore:EObject" href="TapiCommon.uml#_rBq8YO-fEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__WkxFjIvEeamvfKYyWmELQ" x="241" y="-38"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__WkxFjIvEeamvfKYyWmELQ" x="241" y="-38"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_bsaAXDI_EeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_bsaAXTI_EeamvfKYyWmELQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bsaAXzI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_bsaAXDI_EeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bsaAXTI_EeamvfKYyWmELQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bsaAXzI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bsaAXjI_EeamvfKYyWmELQ" x="497" y="230"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bsaAXjI_EeamvfKYyWmELQ" x="497" y="230"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IOfcwDK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IOfcwTK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IOfcwzK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_IOfcwDK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IOfcwTK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IOfcwzK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IOfcwjK-EeaULOmJRJKM0Q" x="497" y="230"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IOfcwjK-EeaULOmJRJKM0Q" x="497" y="230"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_McsitjK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_McsitzK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_McsiuTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_McsitjK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_McsitzK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_McsiuTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_McsiuDK-EeaULOmJRJKM0Q" x="497" y="230"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_McsiuDK-EeaULOmJRJKM0Q" x="497" y="230"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_NrbXtzM-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_NrbXuDM-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_NrbXujM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_NrbXtzM-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NrbXuDM-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NrbXujM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NrbXuTM-EeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NrbXuTM-EeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_D-1g_DM_EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_D-1g_TM_EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_D-1g_zM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_D-1g_DM_EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D-1g_TM_EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D-1g_zM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_D-1g_jM_EeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-1g_jM_EeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_TVE1cjNAEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_TVE1czNAEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_TVE1dTNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_TVE1cjNAEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TVE1czNAEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TVE1dTNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TVE1dDNAEeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TVE1dDNAEeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_VKOxfzNGEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_VKOxgDNGEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VKOxgjNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_VKOxfzNGEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_VKOxgDNGEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VKOxgjNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VKOxgTNGEeaULOmJRJKM0Q" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VKOxgTNGEeaULOmJRJKM0Q" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_4F8a9jN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_4F8a9zN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4F8a-TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_4F8a9jN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4F8a9zN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4F8a-TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4F8a-DN4Eea0Br-ajMxp_A" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8a-DN4Eea0Br-ajMxp_A" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_4GFkcDN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_4GFkcTN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4GFkczN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_4GFkcDN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4GFkcTN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4GFkczN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4GFkcjN4Eea0Br-ajMxp_A" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GFkcjN4Eea0Br-ajMxp_A" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_AX3hvzOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_AX3hwDOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_AX3hwjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_AX3hvzOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_AX3hwDOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AX3hwjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_AX3hwTOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AX3hwTOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BAFYGjOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYGzOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYHTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BAFYGjOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYGzOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYHTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYHDOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYHDOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BAFYLjOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYLzOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYMTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BAFYLjOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYLzOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYMTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYMDOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYMDOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BBa0_jOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa0_zOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa1ATOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BBa0_jOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa0_zOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa1ATOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa1ADOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa1ADOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BBa1EjOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa1EzOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa1FTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BBa1EjOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa1EzOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa1FTOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa1FDOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa1FDOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_U-QXEDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_U-QXETOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_U-QXEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_U-QXEDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U-QXETOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_U-QXEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_U-QXEjOGEeansfg7-s4Unw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U-QXEjOGEeansfg7-s4Unw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_tkFcXj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_tkFcXz4ZEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_tkFcYT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_tkFcXj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tkFcXz4ZEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tkFcYT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tkFcYD4ZEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tkFcYD4ZEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Z5H0DD4hEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Z5H0DT4hEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Z5H0Dz4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_Z5H0DD4hEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Z5H0DT4hEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5H0Dz4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Z5H0Dj4hEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5H0Dj4hEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LNo6Bz4lEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LNo6CD4lEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LNo6Cj4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_LNo6Bz4lEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LNo6CD4lEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LNo6Cj4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LNo6CT4lEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LNo6CT4lEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_bBUh8z4yEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_bBUh9D4yEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bBUh9j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_bBUh8z4yEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bBUh9D4yEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bBUh9j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bBUh9T4yEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bBUh9T4yEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nvYTgD4zEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nvYTgT4zEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nvYTgz4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_nvYTgD4zEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_nvYTgT4zEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nvYTgz4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nvYTgj4zEea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nvYTgj4zEea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_dJdy0z41Eea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_dJdy1D41Eea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dJdy1j41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_dJdy0z41Eea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_dJdy1D41Eea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dJdy1j41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dJdy1T41Eea-1_BGg-qcjQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dJdy1T41Eea-1_BGg-qcjQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Y0aHUkTYEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Y0aHU0TYEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Y0aHVUTYEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_Y0aHUkTYEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Y0aHU0TYEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Y0aHVUTYEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y0aHVETYEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y0aHVETYEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_4ABuQUTbEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_4ABuQkTbEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4ABuRETbEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_4ABuQUTbEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4ABuQkTbEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4ABuRETbEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4ABuQ0TbEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ABuQ0TbEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Yt7SX0TdEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Yt7SYETdEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Yt7SYkTdEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_Yt7SX0TdEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Yt7SYETdEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Yt7SYkTdEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Yt7SYUTdEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yt7SYUTdEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hPFlHkTpEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hPFlH0TpEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hPFlIUTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_hPFlHkTpEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hPFlH0TpEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hPFlIUTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hPFlIETpEead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPFlIETpEead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_v2-InkT2Eead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_v2-In0T2Eead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_v2-IoUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_v2-InkT2Eead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_v2-In0T2Eead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_v2-IoUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_v2-IoET2Eead1bezhJG4aw" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v2-IoET2Eead1bezhJG4aw" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_2MOgUEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_2MOgUUXCEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2MOgU0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_2MOgUEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2MOgUUXCEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2MOgU0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2MOgUkXCEeaB8vMnkFQLXQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2MOgUkXCEeaB8vMnkFQLXQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wxpQg0XOEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wxpQhEXOEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wxpQhkXOEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_wxpQg0XOEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wxpQhEXOEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wxpQhkXOEeaB8vMnkFQLXQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wxpQhUXOEeaB8vMnkFQLXQ" x="-24" y="-121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxpQhUXOEeaB8vMnkFQLXQ" x="-24" y="-121"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_fWXagEXQEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_fWXagUXQEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fWXag0XQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_fWXagEXQEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fWXagUXQEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fWXag0XQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fWXagkXQEeaB8vMnkFQLXQ" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fWXagkXQEeaB8vMnkFQLXQ" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_5fJ-kEzyEeabHNlo0UKXdA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_5fJ-kUzyEeabHNlo0UKXdA" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_5fJ-k0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_5fJ-kEzyEeabHNlo0UKXdA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5fJ-kUzyEeabHNlo0UKXdA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5fJ-k0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5fJ-kkzyEeabHNlo0UKXdA" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5fJ-kkzyEeabHNlo0UKXdA" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_OFgD8E0LEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_OFgD8U0LEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_OFgD800LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_OFgD8E0LEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OFgD8U0LEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OFgD800LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_OFgD8k0LEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OFgD8k0LEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_GrVGJk0NEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_GrVGJ00NEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_GrVGKU0NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_GrVGJk0NEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GrVGJ00NEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GrVGKU0NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GrVGKE0NEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GrVGKE0NEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_fI-rdE0OEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_fI-rdU0OEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fI-rd00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_fI-rdE0OEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fI-rdU0OEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fI-rd00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fI-rdk0OEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fI-rdk0OEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_SJv7100WEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_SJv72E0WEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SJv72k0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_SJv7100WEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SJv72E0WEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SJv72k0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SJv72U0WEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SJv72U0WEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HcjjME0XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HcjjMU0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HcjjM00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_HcjjME0XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HcjjMU0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HcjjM00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HcjjMk0XEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HcjjMk0XEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_VjY7b00XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_VjY7cE0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VjY7ck0XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_VjY7b00XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_VjY7cE0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VjY7ck0XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VjY7cU0XEeaqn4OIuRCwEg" x="630" y="249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VjY7cU0XEeaqn4OIuRCwEg" x="630" y="249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_mmZT8k0YEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_mmZT800YEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_mmZT9U0YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_mmZT8k0YEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mmZT800YEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mmZT9U0YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mmZT9E0YEeaqn4OIuRCwEg" x="610" y="173"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mmZT9E0YEeaqn4OIuRCwEg" x="610" y="173"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_7Hv64HTwEeaoHe3mKsYq3Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_7Hv64XTwEeaoHe3mKsYq3Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_7Hv643TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_7Hv64HTwEeaoHe3mKsYq3Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7Hv64XTwEeaoHe3mKsYq3Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7Hv643TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_7Hv64nTwEeaoHe3mKsYq3Q" x="610" y="173"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Hv64nTwEeaoHe3mKsYq3Q" x="610" y="173"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ZdeNvXrqEeavcODnuX7FyA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ZdeNvnrqEeavcODnuX7FyA" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZdeNwHrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_ZdeNvXrqEeavcODnuX7FyA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ZdeNvnrqEeavcODnuX7FyA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZdeNwHrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZdeNv3rqEeavcODnuX7FyA" x="610" y="173"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZdeNv3rqEeavcODnuX7FyA" x="610" y="173"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_cEGHhcFhEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_cEGHhsFhEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cEGHiMFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_cEGHhcFhEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cEGHhsFhEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cEGHiMFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cEGHh8FhEeaALJQAf08uAg" x="610" y="173"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cEGHh8FhEeaALJQAf08uAg" x="610" y="173"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_aW_QMsFiEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_aW_QM8FiEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aW_QNcFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_aW_QMsFiEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aW_QM8FiEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aW_QNcFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aW_QNMFiEeaALJQAf08uAg" x="610" y="173"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aW_QNMFiEeaALJQAf08uAg" x="610" y="173"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_qlD9QMFpEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_qlD9QcFpEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_qlD9Q8FpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_qlD9QMFpEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qlD9QcFpEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qlD9Q8FpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_qlD9QsFpEeaALJQAf08uAg" x="610" y="173"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qlD9QsFpEeaALJQAf08uAg" x="610" y="173"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_l-Zyc8F3EeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_l-ZydMF3EeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_l-ZydsF3EeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
+    <children xmi:type="notation:Shape" xmi:id="_l-Zyc8F3EeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_l-ZydMF3EeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l-ZydsF3EeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_l-ZydcF3EeaALJQAf08uAg" x="-62" y="-130"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l-ZydcF3EeaALJQAf08uAg" x="-62" y="-130"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_M1cfE8F5EeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_M1cfFMF5EeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M1cfFsF5EeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
+    <children xmi:type="notation:Shape" xmi:id="_M1cfE8F5EeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_M1cfFMF5EeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M1cfFsF5EeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_M1cfFcF5EeaALJQAf08uAg" x="-34" y="-280"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M1cfFcF5EeaALJQAf08uAg" x="-34" y="-280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_kLocxu33EeaRONVEJOGI1g" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_kLocx-33EeaRONVEJOGI1g" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kLocye33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_kLocxu33EeaRONVEJOGI1g" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_kLocx-33EeaRONVEJOGI1g" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kLocye33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kLocyO33EeaRONVEJOGI1g" x="87" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kLocyO33EeaRONVEJOGI1g" x="87" y="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_rwI9oPlIEeaQEoLj_Ia_cg" type="Interface_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_rwI9ovlIEeaQEoLj_Ia_cg" type="Interface_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rwI9o_lIEeaQEoLj_Ia_cg" type="Interface_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rwI9pPlIEeaQEoLj_Ia_cg" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_rwI9oPlIEeaQEoLj_Ia_cg" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rwI9ovlIEeaQEoLj_Ia_cg" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rwI9o_lIEeaQEoLj_Ia_cg" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rwI9pPlIEeaQEoLj_Ia_cg" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rwI9pflIEeaQEoLj_Ia_cg" type="Interface_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rwI9pvlIEeaQEoLj_Ia_cg"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rwI9p_lIEeaQEoLj_Ia_cg"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rwI9qPlIEeaQEoLj_Ia_cg"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9qflIEeaQEoLj_Ia_cg"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rwI9pflIEeaQEoLj_Ia_cg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rwI9pvlIEeaQEoLj_Ia_cg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rwI9p_lIEeaQEoLj_Ia_cg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rwI9qPlIEeaQEoLj_Ia_cg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9qflIEeaQEoLj_Ia_cg"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rwI9qvlIEeaQEoLj_Ia_cg" type="Interface_OperationCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_rbQHsPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_v1KHMPPkEeinaYo1FpF9OA" name="maskLabel">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rwI9qvlIEeaQEoLj_Ia_cg" type="Interface_OperationCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_rbQHsPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_v1KHMPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -645,11 +645,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_WHPN6FJvEeWcs7ZjyujtOg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_rbQHsfPkEeinaYo1FpF9OA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_WHPN6FJvEeWcs7ZjyujtOg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rbQHsfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_rbQuwPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_w2LfUPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_rbQuwPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_w2LfUPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -658,11 +658,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_WHPN81JvEeWcs7ZjyujtOg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_rbQuwfPkEeinaYo1FpF9OA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_WHPN81JvEeWcs7ZjyujtOg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rbQuwfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_tAPvkPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_xWWNIPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_tAPvkPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_xWWNIPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -671,11 +671,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_AnTcAKU5EeWkWNPM1BHzGA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_tAPvkfPkEeinaYo1FpF9OA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_AnTcAKU5EeWkWNPM1BHzGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tAPvkfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_tAQWoPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_zKENgPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_tAQWoPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_zKENgPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -684,11 +684,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_qH8fkL2NEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_tAQWofPkEeinaYo1FpF9OA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_qH8fkL2NEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tAQWofPkEeinaYo1FpF9OA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_tAQWovPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_zjrnYPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_tAQWovPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_zjrnYPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -697,11 +697,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_lQR28L2WEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_tAQWo_PkEeinaYo1FpF9OA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_lQR28L2WEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tAQWo_PkEeinaYo1FpF9OA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_udvBQPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_0BrK8PPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_udvBQPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_0BrK8PPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -710,11 +710,11 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_WHPN5VJvEeWcs7ZjyujtOg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_udvBQfPkEeinaYo1FpF9OA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_WHPN5VJvEeWcs7ZjyujtOg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_udvBQfPkEeinaYo1FpF9OA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_udvoUPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
-          <styles xsi:type="notation:StringListValueStyle" xmi:id="_0gHacPPkEeinaYo1FpF9OA" name="maskLabel">
+        <children xmi:type="notation:Shape" xmi:id="_udvoUPPkEeinaYo1FpF9OA" type="Operation_InterfaceOperationLabel">
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_0gHacPPkEeinaYo1FpF9OA" name="maskLabel">
             <stringListValue>parametersName</stringListValue>
             <stringListValue>parametersDirection</stringListValue>
             <stringListValue>parametersMultiplicity</stringListValue>
@@ -723,4941 +723,4941 @@
             <stringListValue>parametersType</stringListValue>
             <stringListValue>returnType</stringListValue>
           </styles>
-          <element href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_udvoUfPkEeinaYo1FpF9OA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rwI9q_lIEeaQEoLj_Ia_cg"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rwI9rPlIEeaQEoLj_Ia_cg"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rwI9rflIEeaQEoLj_Ia_cg"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9rvlIEeaQEoLj_Ia_cg"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rwI9r_lIEeaQEoLj_Ia_cg" visible="false" type="Interface_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rwI9sPlIEeaQEoLj_Ia_cg"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rwI9sflIEeaQEoLj_Ia_cg"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rwI9svlIEeaQEoLj_Ia_cg"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9s_lIEeaQEoLj_Ia_cg"/>
-      </children>
-      <element href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rwI9oflIEeaQEoLj_Ia_cg" x="-300" y="-456" height="155"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ysyms_lIEeaQEoLj_Ia_cg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ysymtPlIEeaQEoLj_Ia_cg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ysymtvlIEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ysymtflIEeaQEoLj_Ia_cg" x="189" y="-337"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BDPgIP4xEea_VPdGG2-szQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BDPgIv4xEea_VPdGG2-szQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BDPgI_4xEea_VPdGG2-szQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BDPgJP4xEea_VPdGG2-szQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BDPgJf4xEea_VPdGG2-szQ" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_n4dMgNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_nxcI8jLCEeaULOmJRJKM0Q"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dMgdoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4dzkNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_c8MLxDLEEeaULOmJRJKM0Q"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzkdoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4dzktoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_wGVAhMF-EeaALJQAf08uAg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzk9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4dzlNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_xyluAsF-EeaALJQAf08uAg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzldoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4dzltoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_Ca3vhP4zEea_VPdGG2-szQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzl9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4dzmNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_MjEHhP4zEea_VPdGG2-szQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzmdoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4dzmtoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_tAVeAE5qEeeicu4cm-7qRg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4dzm9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4eaoNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_5TDM0U5qEeeicu4cm-7qRg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4eaodoHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_n4eaotoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_3_SWwL11EeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_n4eao9oHEeeYx-v40uoW_Q"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BDPgJv4xEea_VPdGG2-szQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BDPgJ_4xEea_VPdGG2-szQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BDPgKP4xEea_VPdGG2-szQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgKf4xEea_VPdGG2-szQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BDPgKv4xEea_VPdGG2-szQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BDPgK_4xEea_VPdGG2-szQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BDPgLP4xEea_VPdGG2-szQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BDPgLf4xEea_VPdGG2-szQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgLv4xEea_VPdGG2-szQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BDPgL_4xEea_VPdGG2-szQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BDPgMP4xEea_VPdGG2-szQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BDPgMf4xEea_VPdGG2-szQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BDPgMv4xEea_VPdGG2-szQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgM_4xEea_VPdGG2-szQ"/>
-      </children>
-      <element href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BDPgIf4xEea_VPdGG2-szQ" x="-283" y="185" width="302" height="296"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__Y_BEIfVEeeirpBaj87qAw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="__Y_BEofVEeeirpBaj87qAw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__Y_oIIfVEeeirpBaj87qAw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__Y_oIYfVEeeirpBaj87qAw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__Y_oIofVEeeirpBaj87qAw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_l_p30NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_p30doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_p30toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_p309oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_qe4NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe4doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_qe4toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe49oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_qe5NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe5doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_qe5toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe59oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_qe6NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe6doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_qe6toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_qe69oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_rF8NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_rF8doHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_rF8toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_rF89oHEeeYx-v40uoW_Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_l_rF9NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_l_rF9doHEeeYx-v40uoW_Q"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__Y_oI4fVEeeirpBaj87qAw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__Y_oJIfVEeeirpBaj87qAw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__Y_oJYfVEeeirpBaj87qAw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_oJofVEeeirpBaj87qAw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__Y_oJ4fVEeeirpBaj87qAw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__Y_oKIfVEeeirpBaj87qAw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__Y_oKYfVEeeirpBaj87qAw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__Y_oKofVEeeirpBaj87qAw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_oK4fVEeeirpBaj87qAw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__Y_oLIfVEeeirpBaj87qAw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__Y_oLYfVEeeirpBaj87qAw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__Y_oLofVEeeirpBaj87qAw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__Y_oL4fVEeeirpBaj87qAw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_oMIfVEeeirpBaj87qAw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__Y_BEYfVEeeirpBaj87qAw" x="-281" y="-28" height="205"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_SCXpgIhDEeeOl5P_FBJSmA" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_SCY3oIhDEeeOl5P_FBJSmA" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SCY3oYhDEeeOl5P_FBJSmA" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SCZesIhDEeeOl5P_FBJSmA" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_SCZesYhDEeeOl5P_FBJSmA" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_N4ymgKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4ymgaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N4z0oKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4z0oaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N4z0oqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4z0o6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N4z0pKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N4z0paSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N40bsqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40bs6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N40btKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40btaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N40btqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40bt6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N40buKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N40buaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N41CwKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N41CwaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N41CwqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N41Cw6SfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_N41CxKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_N41CxaSfEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_zAk_kHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_y4n9cHJbEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_zAk_kXJbEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_SCZesohDEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_SCZes4hDEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_SCZetIhDEeeOl5P_FBJSmA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCZetYhDEeeOl5P_FBJSmA"/>
+          <element xmi:type="uml:Operation" href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_udvoUfPkEeinaYo1FpF9OA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rwI9q_lIEeaQEoLj_Ia_cg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rwI9rPlIEeaQEoLj_Ia_cg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rwI9rflIEeaQEoLj_Ia_cg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9rvlIEeaQEoLj_Ia_cg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rwI9r_lIEeaQEoLj_Ia_cg" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rwI9sPlIEeaQEoLj_Ia_cg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rwI9sflIEeaQEoLj_Ia_cg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rwI9svlIEeaQEoLj_Ia_cg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9s_lIEeaQEoLj_Ia_cg"/>
+      </children>
+      <element xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwI9oflIEeaQEoLj_Ia_cg" x="-300" y="-456" height="155"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ysyms_lIEeaQEoLj_Ia_cg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ysymtPlIEeaQEoLj_Ia_cg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ysymtvlIEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ysymtflIEeaQEoLj_Ia_cg" x="189" y="-337"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BDPgIP4xEea_VPdGG2-szQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BDPgIv4xEea_VPdGG2-szQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BDPgI_4xEea_VPdGG2-szQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BDPgJP4xEea_VPdGG2-szQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BDPgJf4xEea_VPdGG2-szQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_n4dMgNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_nxcI8jLCEeaULOmJRJKM0Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dMgdoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4dzkNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_c8MLxDLEEeaULOmJRJKM0Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzkdoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4dzktoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_wGVAhMF-EeaALJQAf08uAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzk9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4dzlNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_xyluAsF-EeaALJQAf08uAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzldoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4dzltoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_Ca3vhP4zEea_VPdGG2-szQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzl9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4dzmNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_MjEHhP4zEea_VPdGG2-szQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzmdoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4dzmtoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_tAVeAE5qEeeicu4cm-7qRg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4dzm9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4eaoNoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_5TDM0U5qEeeicu4cm-7qRg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4eaodoHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_n4eaotoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_3_SWwL11EeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_n4eao9oHEeeYx-v40uoW_Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BDPgJv4xEea_VPdGG2-szQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BDPgJ_4xEea_VPdGG2-szQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BDPgKP4xEea_VPdGG2-szQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgKf4xEea_VPdGG2-szQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BDPgKv4xEea_VPdGG2-szQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BDPgK_4xEea_VPdGG2-szQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BDPgLP4xEea_VPdGG2-szQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BDPgLf4xEea_VPdGG2-szQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgLv4xEea_VPdGG2-szQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BDPgL_4xEea_VPdGG2-szQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BDPgMP4xEea_VPdGG2-szQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BDPgMf4xEea_VPdGG2-szQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BDPgMv4xEea_VPdGG2-szQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgM_4xEea_VPdGG2-szQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BDPgIf4xEea_VPdGG2-szQ" x="-283" y="185" width="302" height="296"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__Y_BEIfVEeeirpBaj87qAw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__Y_BEofVEeeirpBaj87qAw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__Y_oIIfVEeeirpBaj87qAw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__Y_oIYfVEeeirpBaj87qAw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__Y_oIofVEeeirpBaj87qAw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_l_p30NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_p30doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_p30toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_p309oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_qe4NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe4doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_qe4toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe49oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_qe5NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe5doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_qe5toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe59oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_qe6NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe6doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_qe6toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_qe69oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_rF8NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_rF8doHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_rF8toHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_rF89oHEeeYx-v40uoW_Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_rF9NoHEeeYx-v40uoW_Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_rF9doHEeeYx-v40uoW_Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Y_oI4fVEeeirpBaj87qAw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Y_oJIfVEeeirpBaj87qAw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__Y_oJYfVEeeirpBaj87qAw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_oJofVEeeirpBaj87qAw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__Y_oJ4fVEeeirpBaj87qAw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Y_oKIfVEeeirpBaj87qAw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Y_oKYfVEeeirpBaj87qAw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__Y_oKofVEeeirpBaj87qAw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_oK4fVEeeirpBaj87qAw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__Y_oLIfVEeeirpBaj87qAw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Y_oLYfVEeeirpBaj87qAw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Y_oLofVEeeirpBaj87qAw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__Y_oL4fVEeeirpBaj87qAw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_oMIfVEeeirpBaj87qAw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Y_BEYfVEeeirpBaj87qAw" x="-281" y="-28" height="205"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_SCXpgIhDEeeOl5P_FBJSmA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SCY3oIhDEeeOl5P_FBJSmA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SCY3oYhDEeeOl5P_FBJSmA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SCZesIhDEeeOl5P_FBJSmA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SCZesYhDEeeOl5P_FBJSmA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_N4ymgKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4ymgaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N4z0oKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4z0oaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N4z0oqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4z0o6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N4z0pKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N4z0paSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N40bsqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40bs6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N40btKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40btaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N40btqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40bt6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N40buKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N40buaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N41CwKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N41CwaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N41CwqSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N41Cw6SfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_N41CxKSfEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_N41CxaSfEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_zAk_kHJbEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_y4n9cHJbEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_zAk_kXJbEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SCZesohDEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SCZes4hDEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SCZetIhDEeeOl5P_FBJSmA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCZetYhDEeeOl5P_FBJSmA"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_SCZetohDEeeOl5P_FBJSmA" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_SCZet4hDEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_SCZeuIhDEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_SCZeuYhDEeeOl5P_FBJSmA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCZeuohDEeeOl5P_FBJSmA"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SCZetohDEeeOl5P_FBJSmA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SCZet4hDEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SCZeuIhDEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SCZeuYhDEeeOl5P_FBJSmA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCZeuohDEeeOl5P_FBJSmA"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_SCZeu4hDEeeOl5P_FBJSmA" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_SCZevIhDEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_SCZevYhDEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_SCZevohDEeeOl5P_FBJSmA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCZev4hDEeeOl5P_FBJSmA"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SCZeu4hDEeeOl5P_FBJSmA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SCZevIhDEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SCZevYhDEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SCZevohDEeeOl5P_FBJSmA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCZev4hDEeeOl5P_FBJSmA"/>
       </children>
-      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SCXpgYhDEeeOl5P_FBJSmA" x="715" y="-296" width="386" height="239"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SCXpgYhDEeeOl5P_FBJSmA" x="715" y="-296" width="386" height="239"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="__j-OAK1aEeiIjuV0HZnJAQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="__j-OAq1aEeiIjuV0HZnJAQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__j-OA61aEeiIjuV0HZnJAQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__j-OBK1aEeiIjuV0HZnJAQ" y="15"/>
+    <children xmi:type="notation:Shape" xmi:id="__j-OAK1aEeiIjuV0HZnJAQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__j-OAq1aEeiIjuV0HZnJAQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__j-OA61aEeiIjuV0HZnJAQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__j-OBK1aEeiIjuV0HZnJAQ" y="15"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__j-OBa1aEeiIjuV0HZnJAQ" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_QFABQK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_AwfVYK1kEeiqCPid09Hqfw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABQa1kEeiqCPid09Hqfw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__j-OBa1aEeiIjuV0HZnJAQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_QFABQK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_AwfVYK1kEeiqCPid09Hqfw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABQa1kEeiqCPid09Hqfw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QFABQq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_RhdgwL2HEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABQ61kEeiqCPid09Hqfw"/>
+        <children xmi:type="notation:Shape" xmi:id="_QFABQq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_RhdgwL2HEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABQ61kEeiqCPid09Hqfw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QFABRK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_GqeeML2JEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABRa1kEeiqCPid09Hqfw"/>
+        <children xmi:type="notation:Shape" xmi:id="_QFABRK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_GqeeML2JEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABRa1kEeiqCPid09Hqfw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QFABRq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_YQtngIoPEeivCevppATXng"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABR61kEeiqCPid09Hqfw"/>
+        <children xmi:type="notation:Shape" xmi:id="_QFABRq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_YQtngIoPEeivCevppATXng"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABR61kEeiqCPid09Hqfw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QFABSK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_-XrtYIfbEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABSa1kEeiqCPid09Hqfw"/>
+        <children xmi:type="notation:Shape" xmi:id="_QFABSK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_-XrtYIfbEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABSa1kEeiqCPid09Hqfw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QFABSq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_6ZZS4IfbEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABS61kEeiqCPid09Hqfw"/>
+        <children xmi:type="notation:Shape" xmi:id="_QFABSq1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_6ZZS4IfbEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABS61kEeiqCPid09Hqfw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_QFABTK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
-          <element href="TapiPathComputation.uml#_1dtjYIfYEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_QFABTa1kEeiqCPid09Hqfw"/>
+        <children xmi:type="notation:Shape" xmi:id="_QFABTK1kEeiqCPid09Hqfw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiPathComputation.uml#_1dtjYIfYEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QFABTa1kEeiqCPid09Hqfw"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__j-OBq1aEeiIjuV0HZnJAQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__j-OB61aEeiIjuV0HZnJAQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__j-OCK1aEeiIjuV0HZnJAQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-OCa1aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__j-OBq1aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__j-OB61aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__j-OCK1aEeiIjuV0HZnJAQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OCa1aEeiIjuV0HZnJAQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__j-OCq1aEeiIjuV0HZnJAQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__j-OC61aEeiIjuV0HZnJAQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__j-ODK1aEeiIjuV0HZnJAQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__j-ODa1aEeiIjuV0HZnJAQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-ODq1aEeiIjuV0HZnJAQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__j-OCq1aEeiIjuV0HZnJAQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__j-OC61aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__j-ODK1aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__j-ODa1aEeiIjuV0HZnJAQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-ODq1aEeiIjuV0HZnJAQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__j-OD61aEeiIjuV0HZnJAQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__j-OEK1aEeiIjuV0HZnJAQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__j-OEa1aEeiIjuV0HZnJAQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__j-OEq1aEeiIjuV0HZnJAQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-OE61aEeiIjuV0HZnJAQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__j-OD61aEeiIjuV0HZnJAQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__j-OEK1aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__j-OEa1aEeiIjuV0HZnJAQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__j-OEq1aEeiIjuV0HZnJAQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OE61aEeiIjuV0HZnJAQ"/>
       </children>
-      <element href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j-OAa1aEeiIjuV0HZnJAQ" x="-282" y="-280" height="238"/>
+      <element xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j-OAa1aEeiIjuV0HZnJAQ" x="-282" y="-280" height="238"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XxHVoKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XxHVoasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxHVo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <children xmi:type="notation:Shape" xmi:id="_8j7IYK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8j7IYa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8j7IY62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XxHVoqsnEeqiJu55eR3W2w" x="422" y="56"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8j7IYq2TEeqipqzgj0j3-A" x="422" y="56"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XySaUKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XySaUasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XySaU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
+    <children xmi:type="notation:Shape" xmi:id="_8lufMK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8lufMa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8lufM62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XySaUqsnEeqiJu55eR3W2w" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8lufMq2TEeqipqzgj0j3-A" x="422" y="-44"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XybkQKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XybkQasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XybkQ6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_8mR40K2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8mR40a2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8mR4062TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XybkQqsnEeqiJu55eR3W2w" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8mR40q2TEeqipqzgj0j3-A" x="422" y="-44"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XylVQKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XylVQasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XylVQ6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_8mgiUK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8mgiUa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8mhJYK2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XylVQqsnEeqiJu55eR3W2w" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8mgiUq2TEeqipqzgj0j3-A" x="422" y="-44"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xyw7cKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xyw7casnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xyw7c6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_8mtWoK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8mtWoa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8mtWo62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xyw7cqsnEeqiJu55eR3W2w" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8mtWoq2TEeqipqzgj0j3-A" x="422" y="-44"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xy7TgKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xy7TgasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xy7Tg6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_8m8AIK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8m8AIa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8m8AI62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xy7TgqsnEeqiJu55eR3W2w" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8m8AIq2TEeqipqzgj0j3-A" x="422" y="-44"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XzGSoKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XzGSoasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzGSo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_8nI0cK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8nI0ca2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8nI0c62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XzGSoqsnEeqiJu55eR3W2w" x="422" y="-44"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8nI0cq2TEeqipqzgj0j3-A" x="422" y="-44"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XzjloKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XzjloasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzkMsKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_8n5CYK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8n5CYa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8n5CY62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XzjloqsnEeqiJu55eR3W2w" x="408" y="-280"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8n5CYq2TEeqipqzgj0j3-A" x="400" y="-300"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X3dOMKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X3dOMasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X3dOM6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <children xmi:type="notation:Shape" xmi:id="_8qd1QK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8qd1Qa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8qd1Q62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X3dOMqsnEeqiJu55eR3W2w" x="919" y="220"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8qd1Qq2TEeqipqzgj0j3-A" x="919" y="220"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X5IpMKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X5IpMasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5IpM6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_8s43IK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8s43Ia2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8s43I62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X5IpMqsnEeqiJu55eR3W2w" x="919" y="120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8s43Iq2TEeqipqzgj0j3-A" x="919" y="120"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X5ToUKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X5ToUasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5UPYKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_8tDPMK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8tDPMa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8tDPM62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X5ToUqsnEeqiJu55eR3W2w" x="919" y="120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8tDPMq2TEeqipqzgj0j3-A" x="919" y="120"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X51MwKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X51MwasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X51z0KsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_8txn8K2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8txn8a2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8txn862TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X51MwqsnEeqiJu55eR3W2w" x="918" y="13"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8txn8q2TEeqipqzgj0j3-A" x="918" y="13"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X648sKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X648sasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X648s6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_8vPAgK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8vPAga2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8vPAg62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X648sqsnEeqiJu55eR3W2w" x="300" y="315"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vPAgq2TEeqipqzgj0j3-A" x="300" y="315"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X9F8IKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X9F8IasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X9F8I6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <children xmi:type="notation:Shape" xmi:id="_8xxXIK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8xxXIa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8xx-MK2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X9F8IqsnEeqiJu55eR3W2w" x="-100" y="-456"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8xxXIq2TEeqipqzgj0j3-A" x="-100" y="-456"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X-LhQKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X-LhQasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X-MIUKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_8zDwkK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8zDwka2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8zDwk62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X-LhQqsnEeqiJu55eR3W2w" x="-83" y="185"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8zDwkq2TEeqipqzgj0j3-A" x="-83" y="185"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_X_0gAKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_X_0gAasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X_0gA6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <children xmi:type="notation:Shape" xmi:id="_81dkUK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_81dkUa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_81dkU62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X_0gAqsnEeqiJu55eR3W2w" x="-81" y="-28"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_81dkUq2TEeqipqzgj0j3-A" x="-81" y="-28"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YBbCgKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YBbCgasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YBbCg6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xmi:type="notation:Shape" xmi:id="_84jUkK2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_84jUka2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_84jUk62TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YBbCgqsnEeqiJu55eR3W2w" x="915" y="-296"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_84jUkq2TEeqipqzgj0j3-A" x="915" y="-296"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YDZYcKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YDZYcasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YDZ_gKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_87WJ4K2TEeqipqzgj0j3-A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_87WJ4a2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_87WJ462TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YDZYcqsnEeqiJu55eR3W2w" x="-82" y="-183"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87WJ4q2TEeqipqzgj0j3-A" x="-82" y="-280"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_vmgeMTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_vmgeMjBFEeam35bpdXJzEw"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_GnTpEIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_vmgeMTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_vmgeMjBFEeam35bpdXJzEw"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GnTpEIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_M1cfF8F5EeaALJQAf08uAg" type="StereotypeCommentLink" target="_M1cfE8F5EeaALJQAf08uAg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_M1cfGMF5EeaALJQAf08uAg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_M1cfHMF5EeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_M1cfGcF5EeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M1cfGsF5EeaALJQAf08uAg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_M1cfG8F5EeaALJQAf08uAg"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_kLocyu33EeaRONVEJOGI1g" type="StereotypeCommentLink" target="_kLocxu33EeaRONVEJOGI1g">
-      <styles xsi:type="notation:FontStyle" xmi:id="_kLocy-33EeaRONVEJOGI1g"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_kLocz-33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kLoczO33EeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kLocze33EeaRONVEJOGI1g"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kLoczu33EeaRONVEJOGI1g"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_lT2KsIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__Y_BEIfVEeeirpBaj87qAw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xwIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oFyG0IuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xwYuQEeiu6boZkiJHCA" x="-1" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xwouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oLPOkIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xw4uQEeiu6boZkiJHCA" x="-1" y="12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xxIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oQNOIIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xxYuQEeiu6boZkiJHCA" x="25" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xxouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oWjGsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xx4uQEeiu6boZkiJHCA" x="-26" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xyIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oduFsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xyYuQEeiu6boZkiJHCA" x="13" y="-21"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lT2xyouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_oj93oIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lT2xy4uQEeiu6boZkiJHCA" x="-12" y="-19"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_lT2KsYuQEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_lT2KsouQEeiu6boZkiJHCA" points="[222, 102, -643984, -643984]$[49, 65, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nlKtEIuQEeiu6boZkiJHCA" id="(0.0,0.40860215053763443)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oo4M0IuQEeiu6boZkiJHCA" id="(1.0,0.7804878048780488)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_xDbXQIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-UIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fEs4AKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-UYuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-UouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fOHSsKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-U4uQEeiu6boZkiJHCA" x="12" y="5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-VIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fXDzUKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-VYuQEeiu6boZkiJHCA" x="8" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-VouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ffXawKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-V4uQEeiu6boZkiJHCA" x="-8" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-WIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fnMhEKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-WYuQEeiu6boZkiJHCA" x="5" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xDb-WouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_fu6SoKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xDb-W4uQEeiu6boZkiJHCA" x="-8" y="-20"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_xDbXQYuQEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xDbXQouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_zRejMIuQEeiu6boZkiJHCA" id="(0.09501187648456057,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_y-LMsIuQEeiu6boZkiJHCA" id="(0.06040268456375839,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_z_dqkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqk4uQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_f2wnEKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqlIuQEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqlYuQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gAKasKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqlouQEeiu6boZkiJHCA" x="16" y="12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_z_dql4uQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gKA6QKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqmIuQEeiu6boZkiJHCA" x="8" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqmYuQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gT52EKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqmouQEeiu6boZkiJHCA" x="-8" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqm4uQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gco7UKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqnIuQEeiu6boZkiJHCA" x="8" y="10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_z_dqnYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gki6IKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_z_dqnouQEeiu6boZkiJHCA" x="-6" y="18"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_z_dqkYuQEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z_dqkouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1udjAIuQEeiu6boZkiJHCA" id="(0.665083135391924,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1Weg0IuQEeiu6boZkiJHCA" id="(0.8657718120805369,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_3JCDkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0G91jDBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqoIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gs9PQKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqoYuQEeiu6boZkiJHCA" x="-3" y="-6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqoouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_g2bUUKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqo4uQEeiu6boZkiJHCA" x="12" y="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqpIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_g_d7kKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqpYuQEeiu6boZkiJHCA" x="8" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqpouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_hHsqgKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JCqp4uQEeiu6boZkiJHCA" x="-8" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_3JCqqIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_hRuJMKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JDRsIuQEeiu6boZkiJHCA" x="8" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_3JDRsYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_haEM4KsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3JDRsouQEeiu6boZkiJHCA" x="-3" y="16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_3JCDkYuQEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_3JCDkouQEeiu6boZkiJHCA" points="[359, 23, -643984, -643984]$[365, -58, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iXm6IK1dEeiIjuV0HZnJAQ" id="(0.46308724832214765,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bhqvUK1YEeiIjuV0HZnJAQ" id="(0.38004750593824227,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8oadYIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_BDPgIP4xEea_VPdGG2-szQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_8obEcIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IKD6EK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obEcYuQEeiu6boZkiJHCA" x="16" y="1"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8obEcouQEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IRySsK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obEc4uQEeiu6boZkiJHCA" y="-4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8obEdIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IaHvUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obEdYuQEeiu6boZkiJHCA" x="27" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8obEdouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IizxQK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obrgIuQEeiu6boZkiJHCA" x="-27" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8obrgYuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ip3bgK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obrgouQEeiu6boZkiJHCA" x="9" y="-16"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8obrg4uQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IzCloK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8obrhIuQEeiu6boZkiJHCA" x="-15" y="-12"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_8oadYYuQEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8oadYouQEeiu6boZkiJHCA" points="[222, 218, -643984, -643984]$[120, 218, -643984, -643984]$[120, 292, -643984, -643984]$[19, 292, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__GDkgIuQEeiu6boZkiJHCA" id="(0.0,0.8709677419354839)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-Mcb8IuQEeiu6boZkiJHCA" id="(1.0,0.3614864864864865)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_DM_ksIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_DM_ks4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XRyRsK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALwIuREeiu6boZkiJHCA" x="8" y="4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DNALwYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XdXPkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALwouREeiu6boZkiJHCA" x="-6" y="-1"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DNALw4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XlwWkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALxIuREeiu6boZkiJHCA" x="12" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DNALxYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XujGMK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALxouREeiu6boZkiJHCA" x="-10" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DNALx4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X3uQUK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALyIuREeiu6boZkiJHCA" x="10" y="-14"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DNALyYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YAsmIK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DNALyouREeiu6boZkiJHCA" x="-11" y="-19"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_DM_ksYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DM_ksouREeiu6boZkiJHCA" points="[311, 242, -643984, -643984]$[277, 313, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EXtEUIuREeiu6boZkiJHCA" id="(0.2080536912751678,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EvkxwIuREeiu6boZkiJHCA" id="(0.5142857142857142,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_G3oqcIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRgIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IFBqoIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRgYuREeiu6boZkiJHCA" x="21" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRgouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IJukcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRg4uREeiu6boZkiJHCA" x="14" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRhIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IO5_YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRhYuREeiu6boZkiJHCA" x="48" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRhouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IVrVwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRh4uREeiu6boZkiJHCA" x="-47" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRiIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IeLxgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRiYuREeiu6boZkiJHCA" x="15" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_G3pRiouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_IjNbcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_G3pRi4uREeiu6boZkiJHCA" x="-12" y="-11"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_G3oqcYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_G3oqcouREeiu6boZkiJHCA" points="[436, 242, -643984, -643984]$[461, 308, -643984, -643984]$[719, 308, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IAcFkIuREeiu6boZkiJHCA" id="(0.802013422818792,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IAcFkYuREeiu6boZkiJHCA" id="(0.0,0.24922118380062305)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_LlPpEIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpE4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NH68wIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpFIuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpFYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NMMYwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpFouREeiu6boZkiJHCA" x="-38" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpF4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NTc3UIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpGIuREeiu6boZkiJHCA" x="46" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpGYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NaTtQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpGouREeiu6boZkiJHCA" x="-46" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpG4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ngf00IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpHIuREeiu6boZkiJHCA" x="8" y="-21"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LlPpHYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_NkztEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LlPpHouREeiu6boZkiJHCA" x="-13" y="-17"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_LlPpEYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_LlPpEouREeiu6boZkiJHCA" points="[800, 441, -643984, -643984]$[800, 480, -643984, -643984]$[660, 480, -643984, -643984]$[660, 400, -643984, -643984]$[719, 400, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDK_oIuREeiu6boZkiJHCA" id="(0.22375690607734808,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NDK_oYuREeiu6boZkiJHCA" id="(0.0,0.5607476635514018)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_S_bisIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_SCXpgIhDEeeOl5P_FBJSmA">
-      <children xsi:type="notation:DecorationNode" xmi:id="_S_bis4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UPBiUIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_bitIuREeiu6boZkiJHCA" x="-135" y="4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S_bitYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UV-e4IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_bitouREeiu6boZkiJHCA" x="-119" y="7"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S_bit4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Uc3xEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_biuIuREeiu6boZkiJHCA" x="65" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S_cJwIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Ui45gIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_cJwYuREeiu6boZkiJHCA" x="-6" y="-30"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S_cJwouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Un2SAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_cJw4uREeiu6boZkiJHCA" x="19" y="17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S_cJxIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_UsfhcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S_cJxYuREeiu6boZkiJHCA" x="-17" y="16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_S_bisYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_S_bisouREeiu6boZkiJHCA" points="[719, 255, -643984, -643984]$[665, 255, -643984, -643984]$[665, -128, -643984, -643984]$[715, -142, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UKluQIuREeiu6boZkiJHCA" id="(0.0,0.12461059190031153)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UKluQYuREeiu6boZkiJHCA" id="(0.0,0.702928870292887)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ZFXmMIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHjqDBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNQYuREeiu6boZkiJHCA" x="-3" y="2"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNQouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNQ4uREeiu6boZkiJHCA" x="18" y="5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNRYuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNRouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNR4uREeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNSIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNSYuREeiu6boZkiJHCA" x="-4" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZFYNSouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZFYNS4uREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_ZFXmMYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZFXmMouREeiu6boZkiJHCA" points="[870, 230, -643984, -643984]$[865, 108, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4qm_oHJaEeq3NYg-TXSAxQ" id="(0.4447513812154696,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6x6qYHJaEeq3NYg-TXSAxQ" id="(0.5328947368421053,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_cGt3UIuREeiu6boZkiJHCA" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_0HHjqDBFEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_cGueYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueYYuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_cGueYouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueY4uREeiu6boZkiJHCA" x="1" y="-6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_cGueZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueZYuREeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_cGueZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueZ4uREeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_cGueaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGueaYuREeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_cGueaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_cGuea4uREeiu6boZkiJHCA" x="4" y="19"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_cGt3UYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cGt3UouREeiu6boZkiJHCA" points="[892, -90, -643984, -643984]$[877, 13, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dhRJwIuREeiu6boZkiJHCA" id="(0.42487046632124353,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dKx8YIuREeiu6boZkiJHCA" id="(0.5296052631578947,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_iiLsYKSfEeiKJbr6a5Jjpg" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_SCXpgIhDEeeOl5P_FBJSmA" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_iiLsY6SfEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lNAT4KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTcKSfEeiKJbr6a5Jjpg" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTcaSfEeiKJbr6a5Jjpg" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lUpM8KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTcqSfEeiKJbr6a5Jjpg" x="-1" y="1"/>
+    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_M1cfF8F5EeaALJQAf08uAg" type="StereotypeCommentLink" target="_M1cfE8F5EeaALJQAf08uAg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_M1cfGMF5EeaALJQAf08uAg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M1cfHMF5EeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_nxS_ADLCEeaULOmJRJKM0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M1cfGcF5EeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M1cfGsF5EeaALJQAf08uAg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M1cfG8F5EeaALJQAf08uAg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_kLocyu33EeaRONVEJOGI1g" type="StereotypeCommentLink" target="_kLocxu33EeaRONVEJOGI1g">
+      <styles xmi:type="notation:FontStyle" xmi:id="_kLocy-33EeaRONVEJOGI1g"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kLocz-33EeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kLoczO33EeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kLocze33EeaRONVEJOGI1g"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kLoczu33EeaRONVEJOGI1g"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lT2KsIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__Y_BEIfVEeeirpBaj87qAw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xwIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oFyG0IuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xwYuQEeiu6boZkiJHCA" x="-1" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xwouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oLPOkIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xw4uQEeiu6boZkiJHCA" x="-1" y="12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xxIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oQNOIIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xxYuQEeiu6boZkiJHCA" x="25" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xxouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oWjGsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xx4uQEeiu6boZkiJHCA" x="-26" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xyIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oduFsIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xyYuQEeiu6boZkiJHCA" x="13" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lT2xyouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oj93oIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lT2xy4uQEeiu6boZkiJHCA" x="-12" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_lT2KsYuQEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lT2KsouQEeiu6boZkiJHCA" points="[222, 102, -643984, -643984]$[49, 65, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nlKtEIuQEeiu6boZkiJHCA" id="(0.0,0.40860215053763443)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oo4M0IuQEeiu6boZkiJHCA" id="(1.0,0.7804878048780488)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xDbXQIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-UIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fEs4AKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-UYuQEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-UouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fOHSsKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-U4uQEeiu6boZkiJHCA" x="12" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-VIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fXDzUKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-VYuQEeiu6boZkiJHCA" x="8" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-VouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ffXawKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-V4uQEeiu6boZkiJHCA" x="-8" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-WIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fnMhEKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-WYuQEeiu6boZkiJHCA" x="5" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xDb-WouQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fu6SoKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xDb-W4uQEeiu6boZkiJHCA" x="-8" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_xDbXQYuQEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_l8BM0MF3EeaALJQAf08uAg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xDbXQouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zRejMIuQEeiu6boZkiJHCA" id="(0.09501187648456057,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y-LMsIuQEeiu6boZkiJHCA" id="(0.06040268456375839,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_z_dqkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G91jDBFEeam35bpdXJzEw" target="_0G9yhzBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqk4uQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_f2wnEKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqlIuQEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqlYuQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gAKasKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqlouQEeiu6boZkiJHCA" x="16" y="12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z_dql4uQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gKA6QKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqmIuQEeiu6boZkiJHCA" x="8" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqmYuQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gT52EKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqmouQEeiu6boZkiJHCA" x="-8" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqm4uQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gco7UKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqnIuQEeiu6boZkiJHCA" x="8" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z_dqnYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gki6IKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z_dqnouQEeiu6boZkiJHCA" x="-6" y="18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_z_dqkYuQEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_wt9DUEXOEeaB8vMnkFQLXQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z_dqkouQEeiu6boZkiJHCA" points="[365, -58, -643984, -643984]$[359, 23, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1udjAIuQEeiu6boZkiJHCA" id="(0.665083135391924,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Weg0IuQEeiu6boZkiJHCA" id="(0.8657718120805369,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_3JCDkIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0G91jDBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqoIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gs9PQKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqoYuQEeiu6boZkiJHCA" x="-3" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqoouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g2bUUKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqo4uQEeiu6boZkiJHCA" x="12" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqpIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g_d7kKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqpYuQEeiu6boZkiJHCA" x="8" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqpouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hHsqgKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JCqp4uQEeiu6boZkiJHCA" x="-8" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3JCqqIuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hRuJMKsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JDRsIuQEeiu6boZkiJHCA" x="8" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3JDRsYuQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_haEM4KsnEeqiJu55eR3W2w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3JDRsouQEeiu6boZkiJHCA" x="-3" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_3JCDkYuQEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3JCDkouQEeiu6boZkiJHCA" points="[359, 23, -643984, -643984]$[365, -58, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXm6IK1dEeiIjuV0HZnJAQ" id="(0.46308724832214765,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bhqvUK1YEeiIjuV0HZnJAQ" id="(0.38004750593824227,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_8oadYIuQEeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_BDPgIP4xEea_VPdGG2-szQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8obEcIuQEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IKD6EK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obEcYuQEeiu6boZkiJHCA" x="16" y="1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8obEcouQEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IRySsK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obEc4uQEeiu6boZkiJHCA" y="-4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8obEdIuQEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IaHvUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obEdYuQEeiu6boZkiJHCA" x="27" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8obEdouQEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IizxQK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obrgIuQEeiu6boZkiJHCA" x="-27" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8obrgYuQEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ip3bgK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obrgouQEeiu6boZkiJHCA" x="9" y="-16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8obrg4uQEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IzCloK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8obrhIuQEeiu6boZkiJHCA" x="-15" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8oadYYuQEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8oadYouQEeiu6boZkiJHCA" points="[222, 218, -643984, -643984]$[120, 218, -643984, -643984]$[120, 292, -643984, -643984]$[19, 292, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__GDkgIuQEeiu6boZkiJHCA" id="(0.0,0.8709677419354839)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-Mcb8IuQEeiu6boZkiJHCA" id="(1.0,0.3614864864864865)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DM_ksIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DM_ks4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XRyRsK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALwIuREeiu6boZkiJHCA" x="8" y="4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DNALwYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XdXPkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALwouREeiu6boZkiJHCA" x="-6" y="-1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DNALw4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XlwWkK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALxIuREeiu6boZkiJHCA" x="12" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DNALxYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XujGMK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALxouREeiu6boZkiJHCA" x="-10" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DNALx4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X3uQUK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALyIuREeiu6boZkiJHCA" x="10" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DNALyYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YAsmIK1cEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DNALyouREeiu6boZkiJHCA" x="-11" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DM_ksYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DM_ksouREeiu6boZkiJHCA" points="[311, 242, -643984, -643984]$[277, 313, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EXtEUIuREeiu6boZkiJHCA" id="(0.2080536912751678,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EvkxwIuREeiu6boZkiJHCA" id="(0.5142857142857142,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_G3oqcIuREeiu6boZkiJHCA" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRgIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IFBqoIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRgYuREeiu6boZkiJHCA" x="21" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRgouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IJukcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRg4uREeiu6boZkiJHCA" x="14" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRhIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IO5_YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRhYuREeiu6boZkiJHCA" x="48" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRhouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IVrVwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRh4uREeiu6boZkiJHCA" x="-47" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRiIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IeLxgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRiYuREeiu6boZkiJHCA" x="15" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G3pRiouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IjNbcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G3pRi4uREeiu6boZkiJHCA" x="-12" y="-11"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_G3oqcYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G3oqcouREeiu6boZkiJHCA" points="[436, 242, -643984, -643984]$[461, 308, -643984, -643984]$[719, 308, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IAcFkIuREeiu6boZkiJHCA" id="(0.802013422818792,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IAcFkYuREeiu6boZkiJHCA" id="(0.0,0.24922118380062305)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LlPpEIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHioDBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpE4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NH68wIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpFIuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpFYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NMMYwIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpFouREeiu6boZkiJHCA" x="-38" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpF4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NTc3UIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpGIuREeiu6boZkiJHCA" x="46" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpGYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NaTtQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpGouREeiu6boZkiJHCA" x="-46" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpG4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ngf00IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpHIuREeiu6boZkiJHCA" x="8" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LlPpHYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NkztEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LlPpHouREeiu6boZkiJHCA" x="-13" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_LlPpEYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LlPpEouREeiu6boZkiJHCA" points="[800, 441, -643984, -643984]$[800, 480, -643984, -643984]$[660, 480, -643984, -643984]$[660, 400, -643984, -643984]$[719, 400, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDK_oIuREeiu6boZkiJHCA" id="(0.22375690607734808,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NDK_oYuREeiu6boZkiJHCA" id="(0.0,0.5607476635514018)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_S_bisIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_SCXpgIhDEeeOl5P_FBJSmA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_S_bis4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UPBiUIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_bitIuREeiu6boZkiJHCA" x="-135" y="4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S_bitYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UV-e4IuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_bitouREeiu6boZkiJHCA" x="-119" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S_bit4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Uc3xEIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_biuIuREeiu6boZkiJHCA" x="65" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S_cJwIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ui45gIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_cJwYuREeiu6boZkiJHCA" x="-6" y="-30"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S_cJwouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Un2SAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_cJw4uREeiu6boZkiJHCA" x="19" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S_cJxIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UsfhcIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S_cJxYuREeiu6boZkiJHCA" x="-17" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_S_bisYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S_bisouREeiu6boZkiJHCA" points="[719, 255, -643984, -643984]$[665, 255, -643984, -643984]$[665, -128, -643984, -643984]$[715, -142, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UKluQIuREeiu6boZkiJHCA" id="(0.0,0.12461059190031153)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UKluQYuREeiu6boZkiJHCA" id="(0.0,0.702928870292887)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZFXmMIuREeiu6boZkiJHCA" type="Association_Edge" source="_0HHioDBFEeam35bpdXJzEw" target="_0HHjqDBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNQYuREeiu6boZkiJHCA" x="-3" y="2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNQouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNQ4uREeiu6boZkiJHCA" x="18" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNRYuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNRouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNR4uREeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNSIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNSYuREeiu6boZkiJHCA" x="-4" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZFYNSouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFYNS4uREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZFXmMYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZFXmMouREeiu6boZkiJHCA" points="[870, 230, -643984, -643984]$[865, 108, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4qm_oHJaEeq3NYg-TXSAxQ" id="(0.4447513812154696,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6x6qYHJaEeq3NYg-TXSAxQ" id="(0.5328947368421053,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_cGt3UIuREeiu6boZkiJHCA" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_0HHjqDBFEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cGueYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueYYuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cGueYouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueY4uREeiu6boZkiJHCA" x="1" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cGueZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueZYuREeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cGueZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueZ4uREeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cGueaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGueaYuREeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cGueaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cGuea4uREeiu6boZkiJHCA" x="4" y="19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_cGt3UYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cGt3UouREeiu6boZkiJHCA" points="[892, -90, -643984, -643984]$[877, 13, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dhRJwIuREeiu6boZkiJHCA" id="(0.42487046632124353,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dKx8YIuREeiu6boZkiJHCA" id="(0.5296052631578947,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_iiLsYKSfEeiKJbr6a5Jjpg" type="Association_Edge" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_SCXpgIhDEeeOl5P_FBJSmA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iiLsY6SfEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lNAT4KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTcKSfEeiKJbr6a5Jjpg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTcaSfEeiKJbr6a5Jjpg" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lUpM8KSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTcqSfEeiKJbr6a5Jjpg" x="-1" y="1"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTc6SfEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lfiOUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTdKSfEeiKJbr6a5Jjpg" x="71" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTc6SfEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lfiOUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTdKSfEeiKJbr6a5Jjpg" x="71" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTdaSfEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_lnnzUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTdqSfEeiKJbr6a5Jjpg" x="-71" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTd6SfEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_luJSEKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTeKSfEeiKJbr6a5Jjpg" x="17" y="-13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_iiMTeaSfEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_l39VYKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_iiMTeqSfEeiKJbr6a5Jjpg" x="-8" y="-10"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTdaSfEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lnnzUKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTdqSfEeiKJbr6a5Jjpg" x="-71" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTd6SfEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_luJSEKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTeKSfEeiKJbr6a5Jjpg" x="17" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iiMTeaSfEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l39VYKSfEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iiMTeqSfEeiKJbr6a5Jjpg" x="-8" y="-10"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_iiLsYaSfEeiKJbr6a5Jjpg"/>
-      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_iiLsYqSfEeiKJbr6a5Jjpg" points="[1101, -176, -643984, -643984]$[1179, -176, -643984, -643984]$[1179, -251, -643984, -643984]$[1101, -251, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lFunMKSfEeiKJbr6a5Jjpg" id="(1.0,0.502092050209205)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lFunMaSfEeiKJbr6a5Jjpg" id="(1.0,0.18828451882845187)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_iiLsYaSfEeiKJbr6a5Jjpg"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iiLsYqSfEeiKJbr6a5Jjpg" points="[1101, -176, -643984, -643984]$[1179, -176, -643984, -643984]$[1179, -251, -643984, -643984]$[1101, -251, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lFunMKSfEeiKJbr6a5Jjpg" id="(1.0,0.502092050209205)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lFunMaSfEeiKJbr6a5Jjpg" id="(1.0,0.18828451882845187)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_W6DjoK1bEeiIjuV0HZnJAQ" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__j-OAK1aEeiIjuV0HZnJAQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djo61bEeiIjuV0HZnJAQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_zzraUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6DjpK1bEeiIjuV0HZnJAQ" x="13" y="-11"/>
+    <edges xmi:type="notation:Connector" xmi:id="_W6DjoK1bEeiIjuV0HZnJAQ" type="Association_Edge" source="_0G9yhzBFEeam35bpdXJzEw" target="__j-OAK1aEeiIjuV0HZnJAQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djo61bEeiIjuV0HZnJAQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_zzraUK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6DjpK1bEeiIjuV0HZnJAQ" x="13" y="-11"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djpa1bEeiIjuV0HZnJAQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_z7zbkK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6Djpq1bEeiIjuV0HZnJAQ" x="29" y="-1"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djpa1bEeiIjuV0HZnJAQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_z7zbkK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6Djpq1bEeiIjuV0HZnJAQ" x="29" y="-1"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djp61bEeiIjuV0HZnJAQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0EMikK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6DjqK1bEeiIjuV0HZnJAQ" x="45" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djp61bEeiIjuV0HZnJAQ" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0EMikK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6DjqK1bEeiIjuV0HZnJAQ" x="45" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djqa1bEeiIjuV0HZnJAQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0M-rIK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6Djqq1bEeiIjuV0HZnJAQ" x="-45" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djqa1bEeiIjuV0HZnJAQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0M-rIK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6Djqq1bEeiIjuV0HZnJAQ" x="-45" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djq61bEeiIjuV0HZnJAQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0V26UK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6DjrK1bEeiIjuV0HZnJAQ" x="17" y="15"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djq61bEeiIjuV0HZnJAQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0V26UK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6DjrK1bEeiIjuV0HZnJAQ" x="17" y="15"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_W6Djra1bEeiIjuV0HZnJAQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0eX9IK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W6Djrq1bEeiIjuV0HZnJAQ" x="-16" y="13"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_W6Djra1bEeiIjuV0HZnJAQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0eX9IK1bEeiIjuV0HZnJAQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W6Djrq1bEeiIjuV0HZnJAQ" x="-16" y="13"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_W6Djoa1bEeiIjuV0HZnJAQ"/>
-      <element href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_W6Djoq1bEeiIjuV0HZnJAQ" points="[222, 51, -643984, -643984]$[132, 51, -643984, -643984]$[132, -100, -643984, -643984]$[16, -100, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XLDNAK1bEeiIjuV0HZnJAQ" id="(0.0,0.1324200913242009)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XLDNAa1bEeiIjuV0HZnJAQ" id="(0.9956896551724138,1.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_W6Djoa1bEeiIjuV0HZnJAQ"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W6Djoq1bEeiIjuV0HZnJAQ" points="[222, 51, -643984, -643984]$[132, 51, -643984, -643984]$[132, -100, -643984, -643984]$[16, -100, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XLDNAK1bEeiIjuV0HZnJAQ" id="(0.0,0.1324200913242009)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XLDNAa1bEeiIjuV0HZnJAQ" id="(0.9956896551724138,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_TysjEIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_TytKIIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_b3PoUIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKIYEIEeqLl4tIPv2RCg" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_TysjEIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TytKIIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b3PoUIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKIYEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TytKIoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_b_lsAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKI4EIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TytKIoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b_lsAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKI4EIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TytKJIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cI7OMIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKJYEIEeqLl4tIPv2RCg" x="6" y="-90"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TytKJIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cI7OMIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKJYEIEeqLl4tIPv2RCg" x="6" y="-90"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TytKJoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cRcRAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytKJ4EIEeqLl4tIPv2RCg" x="-13" y="-43"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TytKJoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cRcRAIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytKJ4EIEeqLl4tIPv2RCg" x="-13" y="-43"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TytxMIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cZidEIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytxMYEIEeqLl4tIPv2RCg" x="6" y="-50"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TytxMIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cZidEIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytxMYEIEeqLl4tIPv2RCg" x="6" y="-50"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_TytxMoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_cidvkIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_TytxM4EIEeqLl4tIPv2RCg" x="-13" y="-83"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TytxMoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cidvkIEIEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TytxM4EIEeqLl4tIPv2RCg" x="-13" y="-83"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_TysjEYEIEeqLl4tIPv2RCg"/>
-      <element href="TapiConnectivity.uml#_To9YQIEIEeqLl4tIPv2RCg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_TysjEoEIEeqLl4tIPv2RCg" points="[450, 440, -643984, -643984]$[520, 440, -643984, -643984]$[520, 743, -643984, -643984]$[450, 743, -643984, -643984]$[450, 680, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UDL2IIEIEeqLl4tIPv2RCg" id="(1.0,0.34153005464480873)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UDL2IYEIEeqLl4tIPv2RCg" id="(1.0,0.9972677595628415)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_TysjEYEIEeqLl4tIPv2RCg"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_To9YQIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TysjEoEIEeqLl4tIPv2RCg" points="[450, 440, -643984, -643984]$[520, 440, -643984, -643984]$[520, 743, -643984, -643984]$[450, 743, -643984, -643984]$[450, 680, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UDL2IIEIEeqLl4tIPv2RCg" id="(1.0,0.34153005464480873)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UDL2IYEIEeqLl4tIPv2RCg" id="(1.0,0.9972677595628415)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_hxbHwIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHw4EIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHxIEIEeqLl4tIPv2RCg" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_hxbHwIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHw4EIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHxIEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHxYEIEeqLl4tIPv2RCg" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHxoEIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHxYEIEeqLl4tIPv2RCg" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHxoEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHx4EIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHyIEIEeqLl4tIPv2RCg" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHx4EIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHyIEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_hxbHyYEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbHyoEIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hxbHyYEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbHyoEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_hxbu0IEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbu0YEIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hxbu0IEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbu0YEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_hxbu0oEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_hxbu04EIEeqLl4tIPv2RCg" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hxbu0oEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxbu04EIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_hxbHwYEIEeqLl4tIPv2RCg"/>
-      <element href="TapiConnectivity.uml#_hpEdAIEIEeqLl4tIPv2RCg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_hxbHwoEIEeqLl4tIPv2RCg" points="[400, 315, -643984, -643984]$[450, 540, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iDUJAIEIEeqLl4tIPv2RCg" id="(0.8571428571428571,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_iDUwEIEIEeqLl4tIPv2RCg" id="(1.0,0.6147540983606558)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_hxbHwYEIEeqLl4tIPv2RCg"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hpEdAIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hxbHwoEIEeqLl4tIPv2RCg" points="[400, 315, -643984, -643984]$[450, 540, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iDUJAIEIEeqLl4tIPv2RCg" id="(0.8571428571428571,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iDUwEIEIEeqLl4tIPv2RCg" id="(1.0,0.6147540983606558)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_rm_esIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFwIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFwYEIEeqLl4tIPv2RCg" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_rm_esIEIEeqLl4tIPv2RCg" type="Association_Edge" source="_0HHlMDBFEeam35bpdXJzEw" target="_0HHlMDBFEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFwIEIEeqLl4tIPv2RCg" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFwYEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFwoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFw4EIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFwoEIEeqLl4tIPv2RCg" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFw4EIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFxIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFxYEIEeqLl4tIPv2RCg" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFxIEIEeqLl4tIPv2RCg" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFxYEIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFxoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFx4EIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFxoEIEeqLl4tIPv2RCg" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFx4EIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFyIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFyYEIEeqLl4tIPv2RCg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFyIEIEeqLl4tIPv2RCg" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFyYEIEeqLl4tIPv2RCg" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rnAFyoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rnAFy4EIEeqLl4tIPv2RCg" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rnAFyoEIEeqLl4tIPv2RCg" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rnAFy4EIEeqLl4tIPv2RCg" y="-20"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_rm_esYEIEeqLl4tIPv2RCg"/>
-      <element href="TapiConnectivity.uml#_rfKYYIEIEeqLl4tIPv2RCg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rm_esoEIEeqLl4tIPv2RCg" points="[380, 315, -643984, -643984]$[450, 520, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_r3NsAIEIEeqLl4tIPv2RCg" id="(0.8,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_r3NsAYEIEeqLl4tIPv2RCg" id="(1.0,0.5601092896174863)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_rm_esYEIEeqLl4tIPv2RCg"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_rfKYYIEIEeqLl4tIPv2RCg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rm_esoEIEeqLl4tIPv2RCg" points="[380, 315, -643984, -643984]$[450, 520, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r3NsAIEIEeqLl4tIPv2RCg" id="(0.8,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r3NsAYEIEeqLl4tIPv2RCg" id="(1.0,0.5601092896174863)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XxHVpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0G9yhzBFEeam35bpdXJzEw" target="_XxHVoKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XxHVpasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XxH8sqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8j7IZK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_0G9yhzBFEeam35bpdXJzEw" target="_8j7IYK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8j7IZa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8j7Iaa2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XxHVpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxH8sKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XxH8sasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8j7IZq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8j7IZ62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8j7IaK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XySaVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lT2KsIuQEeiu6boZkiJHCA" target="_XySaUKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XySaVasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XySaWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8lufNK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_lT2KsIuQEeiu6boZkiJHCA" target="_8lufMK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8lufNa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8lvGQK2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_MKHxQIfWEeeirpBaj87qAw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XySaVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XySaV6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XySaWKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8lufNq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8lufN62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8lufOK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XybkRKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3JCDkIuQEeiu6boZkiJHCA" target="_XybkQKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XybkRasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XybkSasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8mR41K2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_3JCDkIuQEeiu6boZkiJHCA" target="_8mR40K2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8mR41a2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8mR42a2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WFlH4O_qEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XybkRqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XybkR6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XybkSKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8mR41q2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8mR4162TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8mR42K2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XylVRKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_8oadYIuQEeiu6boZkiJHCA" target="_XylVQKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XylVRasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XylVSasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8mhJYa2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_8oadYIuQEeiu6boZkiJHCA" target="_8mgiUK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8mhJYq2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8mhJZq2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Tx9zoP4yEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XylVRqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XylVR6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XylVSKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8mhJY62TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8mhJZK2TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8mhJZa2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xyw7dKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DM_ksIuREeiu6boZkiJHCA" target="_Xyw7cKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xyw7dasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xyw7easnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8mtWpK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_DM_ksIuREeiu6boZkiJHCA" target="_8mtWoK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8mtWpa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8mtWqa2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xyw7dqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xyw7d6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xyw7eKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8mtWpq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8mtWp62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8mtWqK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xy7ThKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_G3oqcIuREeiu6boZkiJHCA" target="_Xy7TgKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xy7ThasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xy76kqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8m8AJK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_G3oqcIuREeiu6boZkiJHCA" target="_8m8AIK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8m8AJa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8m8AKa2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xy7ThqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xy76kKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xy76kasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8m8AJq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8m8AJ62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8m8AKK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XzGSpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_W6DjoK1bEeiIjuV0HZnJAQ" target="_XzGSoKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XzGSpasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzGSqasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8nI0dK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_W6DjoK1bEeiIjuV0HZnJAQ" target="_8nI0cK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8nI0da2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8nI0ea2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_WumhkK1bEeiIjuV0HZnJAQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XzGSpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XzGSp6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XzGSqKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8nI0dq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8nI0d62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8nI0eK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XzkzwKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0G91jDBFEeam35bpdXJzEw" target="_XzjloKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XzkzwasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XzkzxasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8n5CZK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_0G91jDBFEeam35bpdXJzEw" target="_8n5CYK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8n5CZa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8n5Caa2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XzkzwqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xzkzw6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XzkzxKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8n5CZq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8n5CZ62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8n5CaK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X3dONKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0HHioDBFEeam35bpdXJzEw" target="_X3dOMKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X3dONasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X3dOOasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8qd1RK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_0HHioDBFEeam35bpdXJzEw" target="_8qd1QK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8qd1Ra2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8qd1Sa2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X3dONqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X3dON6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X3dOOKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8qd1Rq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qd1R62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qd1SK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X5JQQKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_S_bisIuREeiu6boZkiJHCA" target="_X5IpMKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X5JQQasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5JQRasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8s43JK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_S_bisIuREeiu6boZkiJHCA" target="_8s43IK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8s43Ja2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8s43Ka2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X5JQQqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5JQQ6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5JQRKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8s43Jq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8s43J62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8s43KK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X5UPYasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ZFXmMIuREeiu6boZkiJHCA" target="_X5ToUKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X5UPYqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X5UPZqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8tD2QK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_ZFXmMIuREeiu6boZkiJHCA" target="_8tDPMK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8tD2Qa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8tD2Ra2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X5UPY6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5UPZKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X5UPZasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8tD2Qq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8tD2Q62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8tD2RK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X51z0asnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0HHjqDBFEeam35bpdXJzEw" target="_X51MwKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X51z0qsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X51z1qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8txn9K2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_0HHjqDBFEeam35bpdXJzEw" target="_8txn8K2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8txn9a2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8txn-a2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X51z06snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X51z1KsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X51z1asnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8txn9q2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8txn962TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8txn-K2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X648tKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_0HHlMDBFEeam35bpdXJzEw" target="_X648sKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X648tasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X648uasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8vPAhK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_0HHlMDBFEeam35bpdXJzEw" target="_8vPAgK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8vPAha2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8vPnka2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X648tqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X648t6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X648uKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8vPAhq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8vPAh62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8vPnkK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X9F8JKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_rwI9oPlIEeaQEoLj_Ia_cg" target="_X9F8IKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X9F8JasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X9F8KasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8xx-Ma2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_rwI9oPlIEeaQEoLj_Ia_cg" target="_8xxXIK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8xx-Mq2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8xx-Nq2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X9F8JqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X9F8J6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X9F8KKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8xx-M62TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8xx-NK2TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8xx-Na2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X-MIUasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BDPgIP4xEea_VPdGG2-szQ" target="_X-LhQKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X-MIUqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X-MIVqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8zDwlK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_BDPgIP4xEea_VPdGG2-szQ" target="_8zDwkK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_8zDwla2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8zDwma2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_-fei4P4wEea_VPdGG2-szQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X-MIU6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X-MIVKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X-MIVasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8zDwlq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8zDwl62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8zDwmK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_X_0gBKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__Y_BEIfVEeeirpBaj87qAw" target="_X_0gAKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_X_0gBasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_X_1HEKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_81dkVK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="__Y_BEIfVEeeirpBaj87qAw" target="_81dkUK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_81dkVa2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_81dkWa2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_X_0gBqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X_0gB6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_X_0gCKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_81dkVq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_81dkV62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_81dkWK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YBbChKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_YBbCgKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YBbChasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YBbCiasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_84jUlK2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="_SCXpgIhDEeeOl5P_FBJSmA" target="_84jUkK2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_84jUla2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_84jUma2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YBbChqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YBbCh6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YBbCiKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_84jUlq2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_84jUl62TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_84jUmK2TEeqipqzgj0j3-A"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YDZ_gasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__j-OAK1aEeiIjuV0HZnJAQ" target="_YDZYcKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YDZ_gqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YDZ_hqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_87Ww8K2TEeqipqzgj0j3-A" type="StereotypeCommentLink" source="__j-OAK1aEeiIjuV0HZnJAQ" target="_87WJ4K2TEeqipqzgj0j3-A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_87Ww8a2TEeqipqzgj0j3-A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_87Ww9a2TEeqipqzgj0j3-A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiPathComputation.uml#_qXAPsDJDEeamvfKYyWmELQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YDZ_g6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YDZ_hKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YDZ_hasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_87Ww8q2TEeqipqzgj0j3-A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_87Ww862TEeqipqzgj0j3-A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_87Ww9K2TEeqipqzgj0j3-A"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_9y8uwDBFEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="ConnectivityServiceSkeleton" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_BlU0MDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0MTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0MjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU0MzBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0NDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0NTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0NjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0NzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0ODBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0OTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0OjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0OzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0PDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0PTBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0PjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0PzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0QDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0QTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0QjBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0cDBGEeam35bpdXJzEw" x="-122" y="-3" width="160" height="63"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU0cTBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0cjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0czBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU0dDBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0dTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0djBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0dzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0eDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0eTBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0ejBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0ezBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0fDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0fTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0fjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0fzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0gDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0gTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0gjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0gzBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0sTBGEeam35bpdXJzEw" x="243" y="1" width="208" height="64"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU0sjBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0szBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU0tDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU0tTBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0tjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0tzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0uDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0uTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0ujBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0uzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0vDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0vTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0vjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0vzBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU0wDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU0wTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU0wjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU0wzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU0xDBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU08jBGEeam35bpdXJzEw" x="-159" y="288" height="67"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU1BDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1BTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1BjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU1BzBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1CDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1CTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1CjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1CzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1DDBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1DTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1DjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1DzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1EDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1ETBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1EjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1EzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1FDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1FTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1FjBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1RDBGEeam35bpdXJzEw" x="841" y="278" width="171" height="63"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU1WTBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1WjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU1WzBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU1XDBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1XTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1XjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1XzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1YDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1YTBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1YjBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1YzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1ZDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1ZTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1ZjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU1ZzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1aDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1aTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1ajBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1azBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1mTBGEeam35bpdXJzEw" x="158" y="284" width="255" height="62"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU16TBGEeam35bpdXJzEw" type="Interface_Shape">
-      <eAnnotations xmi:id="_1iHO4BMvEee0L_IMWjydgQ" source="displayNameLabelIcon">
-        <details xmi:id="_1iHO4RMvEee0L_IMWjydgQ" key="displayNameLabelIcon_value" value="true"/>
+    <children xmi:type="notation:Shape" xmi:id="_BlU0MDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0MTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0MjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU0MzBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0NDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0NTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0NjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0NzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0ODBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0OTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0OjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0OzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0PDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0PTBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0PjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0PzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0QDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0QTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0QjBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0cDBGEeam35bpdXJzEw" x="-122" y="-3" width="160" height="63"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU0cTBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0cjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0czBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU0dDBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0dTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0djBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0dzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0eDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0eTBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0ejBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0ezBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0fDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0fTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0fjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0fzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0gDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0gTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0gjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0gzBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0sTBGEeam35bpdXJzEw" x="243" y="1" width="208" height="64"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU0sjBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0szBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU0tDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU0tTBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0tjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0tzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0uDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0uTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0ujBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0uzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0vDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0vTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0vjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0vzBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU0wDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU0wTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU0wjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU0wzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU0xDBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU08jBGEeam35bpdXJzEw" x="-159" y="288" height="67"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU1BDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1BTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1BjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU1BzBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1CDBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1CTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1CjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1CzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1DDBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1DTBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1DjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1DzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1EDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1ETBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1EjBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1EzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1FDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1FTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1FjBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1RDBGEeam35bpdXJzEw" x="841" y="278" width="171" height="63"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU1WTBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1WjBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU1WzBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU1XDBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1XTBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1XjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1XzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1YDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1YTBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1YjBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1YzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1ZDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1ZTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1ZjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU1ZzBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1aDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1aTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1ajBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1azBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1mTBGEeam35bpdXJzEw" x="158" y="284" width="255" height="62"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU16TBGEeam35bpdXJzEw" type="Interface_Shape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1iHO4BMvEee0L_IMWjydgQ" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1iHO4RMvEee0L_IMWjydgQ" key="displayNameLabelIcon_value" value="true"/>
       </eAnnotations>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU16jBGEeam35bpdXJzEw" type="Interface_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU16zBGEeam35bpdXJzEw" type="Interface_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU17DBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU17TBGEeam35bpdXJzEw" visible="false" type="Interface_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU17jBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU17zBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU18DBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU18TBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU18jBGEeam35bpdXJzEw" visible="false" type="Interface_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU18zBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU19DBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU19TBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU19jBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU19zBGEeam35bpdXJzEw" visible="false" type="Interface_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU1-DBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU1-TBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU1-jBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU1-zBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2ITBGEeam35bpdXJzEw" x="-158" y="-109" width="162" height="61"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU2QjBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2QzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2RDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU2RTBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2RjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2RzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2SDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2STBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2SjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2SzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2TDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2TTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2TjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2TzBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2UDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2UTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2UjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2UzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2VDBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2gjBGEeam35bpdXJzEw" x="203" y="169" width="129" height="49"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU2tzBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2uDBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU2uTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU2ujBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2uzBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2vDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2vTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2vjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2vzBGEeam35bpdXJzEw"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU16jBGEeam35bpdXJzEw" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU16zBGEeam35bpdXJzEw" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU17DBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU17TBGEeam35bpdXJzEw" visible="false" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU17jBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU17zBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU18DBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU18TBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU18jBGEeam35bpdXJzEw" visible="false" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU18zBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU19DBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU19TBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU19jBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU19zBGEeam35bpdXJzEw" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU1-DBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU1-TBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU1-jBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU1-zBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2ITBGEeam35bpdXJzEw" x="-158" y="-109" width="162" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU2QjBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2QzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2RDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU2RTBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2RjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2RzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2SDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2STBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2SjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2SzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2TDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2TTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2TjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2TzBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2UDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2UTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2UjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2UzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2VDBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2gjBGEeam35bpdXJzEw" x="203" y="169" width="129" height="49"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BlU2tzBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2uDBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU2uTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU2ujBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2uzBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2vDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2vTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2vjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2vzBGEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2wDBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2wTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2wjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2wzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2xDBGEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2wDBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2wTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2wjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2wzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2xDBGEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU2xTBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU2xjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU2xzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU2yDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU2yTBGEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU2xTBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU2xjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU2xzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU2yDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU2yTBGEeam35bpdXJzEw"/>
       </children>
-      <element href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU29zBGEeam35bpdXJzEw" x="148" y="425" width="164" height="62"/>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU29zBGEeam35bpdXJzEw" x="148" y="425" width="164" height="62"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU3KDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3KTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU3KjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU3KzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU3LDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU3LTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3LjBGEeam35bpdXJzEw"/>
+    <children xmi:type="notation:Shape" xmi:id="_BlU3KDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3KTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU3KjBGEeam35bpdXJzEw" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU3KzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU3LDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU3LTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3LjBGEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU3LzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU3MDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU3MTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU3MjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3MzBGEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU3LzBGEeam35bpdXJzEw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU3MDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU3MTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU3MjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3MzBGEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_BlU3NDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_BlU3NTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_BlU3NjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_BlU3NzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3ODBGEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BlU3NDBGEeam35bpdXJzEw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BlU3NTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BlU3NjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BlU3NzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3ODBGEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3OTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_BlU3OjBGEeam35bpdXJzEw" y="5"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3OTBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlU3OjBGEeam35bpdXJzEw" y="5"/>
       </children>
-      <element href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU3aDBGEeam35bpdXJzEw" x="843" y="82" width="167" height="58"/>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU3aDBGEeam35bpdXJzEw" x="843" y="82" width="167" height="58"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlU3yjBGEeam35bpdXJzEw" type="Constraint_PackagedElementShape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3yzBGEeam35bpdXJzEw" type="Constraint_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_BlU3zDBGEeam35bpdXJzEw" type="Constraint_BodyLabel"/>
-      <element href="TapiConnectivity.uml#_CIxSkLrhEeWYrqoqXLgguw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlU33zBGEeam35bpdXJzEw" x="72" y="-100" width="275" height="46"/>
+    <children xmi:type="notation:Shape" xmi:id="_BlU3yjBGEeam35bpdXJzEw" type="Constraint_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3yzBGEeam35bpdXJzEw" type="Constraint_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BlU3zDBGEeam35bpdXJzEw" type="Constraint_BodyLabel"/>
+      <element xmi:type="uml:Constraint" href="TapiConnectivity.uml#_CIxSkLrhEeWYrqoqXLgguw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlU33zBGEeam35bpdXJzEw" x="72" y="-100" width="275" height="46"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BlxgSDBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BlxgSTBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BlxgSzBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_BlxgSDBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BlxgSTBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BlxgSzBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BlxgSjBGEeam35bpdXJzEw" x="846" y="232"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlxgSjBGEeam35bpdXJzEw" x="846" y="232"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Bl7RKjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Bl7RKzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Bl7RLTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Bl7RKjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Bl7RKzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bl7RLTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Bl7RLDBGEeam35bpdXJzEw" x="571" y="367"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bl7RLDBGEeam35bpdXJzEw" x="571" y="367"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BmEbGjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BmEbGzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmEbHTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
+    <children xmi:type="notation:Shape" xmi:id="_BmEbGjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BmEbGzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmEbHTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmEbHDBGEeam35bpdXJzEw" x="1057" y="506"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmEbHDBGEeam35bpdXJzEw" x="1057" y="506"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BmEbMDBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BmEbMTBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmEbMzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BmEbMDBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BmEbMTBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmEbMzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmEbMjBGEeam35bpdXJzEw" x="1057" y="506"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmEbMjBGEeam35bpdXJzEw" x="1057" y="506"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BmEbRjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BmEbRzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmEbSTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_BmEbRjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BmEbRzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmEbSTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmEbSDBGEeam35bpdXJzEw" x="1057" y="506"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmEbSDBGEeam35bpdXJzEw" x="1057" y="506"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BmhHCjBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BmhHCzBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmhHDTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
+    <children xmi:type="notation:Shape" xmi:id="_BmhHCjBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BmhHCzBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmhHDTBGEeam35bpdXJzEw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmhHDDBGEeam35bpdXJzEw" x="834" y="508"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmhHDDBGEeam35bpdXJzEw" x="834" y="508"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BmhHIDBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BmhHITBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BmhHIzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BmhHIDBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BmhHITBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmhHIzBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BmhHIjBGEeam35bpdXJzEw" x="834" y="508"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmhHIjBGEeam35bpdXJzEw" x="834" y="508"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Bn3K2jBGEeam35bpdXJzEw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Bn3K2zBGEeam35bpdXJzEw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Bn3K3TBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_Bn3K2jBGEeam35bpdXJzEw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Bn3K2zBGEeam35bpdXJzEw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bn3K3TBGEeam35bpdXJzEw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Bn3K3DBGEeam35bpdXJzEw" x="1073" y="369"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bn3K3DBGEeam35bpdXJzEw" x="1073" y="369"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_bkhPpjI_EeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_bkhPpzI_EeamvfKYyWmELQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bkhPqTI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_bkhPpjI_EeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bkhPpzI_EeamvfKYyWmELQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bkhPqTI_EeamvfKYyWmELQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bkhPqDI_EeamvfKYyWmELQ" x="846" y="232"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bkhPqDI_EeamvfKYyWmELQ" x="846" y="232"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IFaY4zK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IFaY5DK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IFaY5jK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_IFaY4zK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IFaY5DK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IFaY5jK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IFaY5TK-EeaULOmJRJKM0Q" x="846" y="232"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IFaY5TK-EeaULOmJRJKM0Q" x="846" y="232"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_MTUjxjK-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_MTUjxzK-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_MTUjyTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_MTUjxjK-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTUjxzK-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MTUjyTK-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_MTUjyDK-EeaULOmJRJKM0Q" x="846" y="232"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTUjyDK-EeaULOmJRJKM0Q" x="846" y="232"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_NkS0QDM-EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_NkS0QTM-EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_NkS0QzM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_NkS0QDM-EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NkS0QTM-EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NkS0QzM-EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NkS0QjM-EeaULOmJRJKM0Q" x="846" y="232"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NkS0QjM-EeaULOmJRJKM0Q" x="846" y="232"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_D3_4oDM_EeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_D3_4oTM_EeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_D3_4ozM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_D3_4oDM_EeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3_4oTM_EeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3_4ozM_EeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_D3_4ojM_EeaULOmJRJKM0Q" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3_4ojM_EeaULOmJRJKM0Q" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_TOrSfzNAEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_TOrSgDNAEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_TOrSgjNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_TOrSfzNAEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TOrSgDNAEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TOrSgjNAEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_TOrSgTNAEeaULOmJRJKM0Q" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TOrSgTNAEeaULOmJRJKM0Q" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_VCDFpjNGEeaULOmJRJKM0Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_VCDFpzNGEeaULOmJRJKM0Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VCDFqTNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_VCDFpjNGEeaULOmJRJKM0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_VCDFpzNGEeaULOmJRJKM0Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VCDFqTNGEeaULOmJRJKM0Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VCDFqDNGEeaULOmJRJKM0Q" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VCDFqDNGEeaULOmJRJKM0Q" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_4F8a5jN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_4F8a5zN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4F8a6TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_4F8a5jN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4F8a5zN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4F8a6TN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4F8a6DN4Eea0Br-ajMxp_A" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8a6DN4Eea0Br-ajMxp_A" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_4F8bADN4Eea0Br-ajMxp_A" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_4F8bATN4Eea0Br-ajMxp_A" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_4F8bAzN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_4F8bADN4Eea0Br-ajMxp_A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4F8bATN4Eea0Br-ajMxp_A" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4F8bAzN4Eea0Br-ajMxp_A" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4F8bAjN4Eea0Br-ajMxp_A" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8bAjN4Eea0Br-ajMxp_A" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_AOC3IDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_AOC3ITOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_AOC3IzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_AOC3IDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_AOC3ITOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AOC3IzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_AOC3IjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AOC3IjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BAFYEDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYETOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BAFYEDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYETOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYEzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYEjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYEjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BAFYJDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BAFYJTOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BAFYJzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BAFYJDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BAFYJTOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAFYJzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BAFYJjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAFYJjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BBa09DOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa09TOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa09zOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BBa09DOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa09TOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa09zOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa09jOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa09jOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_BBa1CDOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_BBa1CTOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_BBa1CzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_BBa1CDOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BBa1CTOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBa1CzOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_BBa1CjOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBa1CjOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_U2ErEzOGEeansfg7-s4Unw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_U2ErFDOGEeansfg7-s4Unw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_U2ErFjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_U2ErEzOGEeansfg7-s4Unw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U2ErFDOGEeansfg7-s4Unw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_U2ErFjOGEeansfg7-s4Unw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_U2ErFTOGEeansfg7-s4Unw" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U2ErFTOGEeansfg7-s4Unw" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_tdP0dj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_tdP0dz4ZEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_tdP0eT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_tdP0dj4ZEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tdP0dz4ZEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tdP0eT4ZEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tdP0eD4ZEea-1_BGg-qcjQ" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tdP0eD4ZEea-1_BGg-qcjQ" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ZzBLxz4hEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ZzBLyD4hEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZzBLyj4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_ZzBLxz4hEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ZzBLyD4hEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZzBLyj4hEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZzBLyT4hEea-1_BGg-qcjQ" x="641" y="233"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZzBLyT4hEea-1_BGg-qcjQ" x="641" y="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LHsC7z4lEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_LHsC8D4lEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_LHsC8j4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_LHsC7z4lEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LHsC8D4lEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LHsC8j4lEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LHsC8T4lEea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LHsC8T4lEea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_avd88z4yEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_avd89D4yEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_avd89j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_avd88z4yEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_avd89D4yEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_avd89j4yEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_avd89T4yEea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_avd89T4yEea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_nd0pdj4zEea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_nd0pdz4zEea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_nd0peT4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_nd0pdj4zEea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_nd0pdz4zEea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nd0peT4zEea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_nd0peD4zEea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nd0peD4zEea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_c1YZdT41Eea-1_BGg-qcjQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_c1YZdj41Eea-1_BGg-qcjQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c1YZeD41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_c1YZdT41Eea-1_BGg-qcjQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_c1YZdj41Eea-1_BGg-qcjQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_c1YZeD41Eea-1_BGg-qcjQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c1YZdz41Eea-1_BGg-qcjQ" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c1YZdz41Eea-1_BGg-qcjQ" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YrxvlETYEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YrxvlUTYEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Yrxvl0TYEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_YrxvlETYEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YrxvlUTYEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Yrxvl0TYEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YrxvlkTYEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YrxvlkTYEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_33ZW40TbEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_33ZW5ETbEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_33ZW5kTbEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_33ZW40TbEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_33ZW5ETbEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_33ZW5kTbEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_33ZW5UTbEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_33ZW5UTbEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Ykm-fETdEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Ykm-fUTdEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Ykm-f0TdEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_Ykm-fETdEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ykm-fUTdEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ykm-f0TdEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Ykm-fkTdEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ykm-fkTdEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hIsCB0TpEead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hIsCCETpEead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hIsCCkTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_hIsCB0TpEead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hIsCCETpEead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hIsCCkTpEead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hIsCCUTpEead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hIsCCUTpEead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_vwkllkT2Eead1bezhJG4aw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_vwkll0T2Eead1bezhJG4aw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_vwklmUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_vwkllkT2Eead1bezhJG4aw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vwkll0T2Eead1bezhJG4aw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vwklmUT2Eead1bezhJG4aw" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_vwklmET2Eead1bezhJG4aw" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vwklmET2Eead1bezhJG4aw" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_2EMlsEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_2EMlsUXCEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_2EMls0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_2EMlsEXCEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2EMlsUXCEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2EMls0XCEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_2EMlskXCEeaB8vMnkFQLXQ" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2EMlskXCEeaB8vMnkFQLXQ" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_fPyRY0XQEeaB8vMnkFQLXQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_fPyRZEXQEeaB8vMnkFQLXQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fPyRZkXQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_fPyRY0XQEeaB8vMnkFQLXQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fPyRZEXQEeaB8vMnkFQLXQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fPyRZkXQEeaB8vMnkFQLXQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fPyRZUXQEeaB8vMnkFQLXQ" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fPyRZUXQEeaB8vMnkFQLXQ" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_5UJooEzyEeabHNlo0UKXdA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_5UJooUzyEeabHNlo0UKXdA" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_5UJoo0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_5UJooEzyEeabHNlo0UKXdA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5UJooUzyEeabHNlo0UKXdA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5UJoo0zyEeabHNlo0UKXdA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_5UJookzyEeabHNlo0UKXdA" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5UJookzyEeabHNlo0UKXdA" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_N2n6Hk0LEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_N2n6H00LEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_N2xrEE0LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_N2n6Hk0LEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_N2n6H00LEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N2xrEE0LEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_N2n6IE0LEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N2n6IE0LEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_GjIzcE0NEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_GjIzcU0NEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_GjIzc00NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_GjIzcE0NEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GjIzcU0NEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GjIzc00NEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GjIzck0NEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GjIzck0NEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_fADZIE0OEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_fADZIU0OEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_fADZI00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_fADZIE0OEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fADZIU0OEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fADZI00OEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_fADZIk0OEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fADZIk0OEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_SDWYh00WEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_SDWYiE0WEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SDWYik0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_SDWYh00WEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SDWYiE0WEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SDWYik0WEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SDWYiU0WEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SDWYiU0WEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HUhopE0XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HUhopU0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUhop00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_HUhopE0XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HUhopU0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HUhop00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUhopk0XEeaqn4OIuRCwEg" x="642" y="134"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhopk0XEeaqn4OIuRCwEg" x="642" y="134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_VcisWE0XEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_VcisWU0XEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_VcisW00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_VcisWE0XEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_VcisWU0XEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VcisW00XEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VcisWk0XEeaqn4OIuRCwEg" x="482" y="33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VcisWk0XEeaqn4OIuRCwEg" x="482" y="33"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_mgcctE0YEeaqn4OIuRCwEg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_mgcctU0YEeaqn4OIuRCwEg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_mgcct00YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_mgcctE0YEeaqn4OIuRCwEg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mgcctU0YEeaqn4OIuRCwEg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mgcct00YEeaqn4OIuRCwEg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mgcctk0YEeaqn4OIuRCwEg" x="482" y="33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgcctk0YEeaqn4OIuRCwEg" x="482" y="33"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_65dnQHTwEeaoHe3mKsYq3Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_65dnQXTwEeaoHe3mKsYq3Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_65dnQ3TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_65dnQHTwEeaoHe3mKsYq3Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_65dnQXTwEeaoHe3mKsYq3Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_65dnQ3TwEeaoHe3mKsYq3Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_65dnQnTwEeaoHe3mKsYq3Q" x="482" y="33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_65dnQnTwEeaoHe3mKsYq3Q" x="482" y="33"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ZVIJs3rqEeavcODnuX7FyA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ZVIJtHrqEeavcODnuX7FyA" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ZVIJtnrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_ZVIJs3rqEeavcODnuX7FyA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ZVIJtHrqEeavcODnuX7FyA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZVIJtnrqEeavcODnuX7FyA" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZVIJtXrqEeavcODnuX7FyA" x="478" y="49"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVIJtXrqEeavcODnuX7FyA" x="478" y="49"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_b9UxE8FhEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_b9UxFMFhEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b9UxFsFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_b9UxE8FhEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_b9UxFMFhEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_b9UxFsFhEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_b9UxFcFhEeaALJQAf08uAg" x="478" y="49"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9UxFcFhEeaALJQAf08uAg" x="478" y="49"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_aP1fE8FiEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_aP1fFMFiEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aP1fFsFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_aP1fE8FiEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aP1fFMFiEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aP1fFsFiEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aP1fFcFiEeaALJQAf08uAg" x="478" y="49"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aP1fFcFiEeaALJQAf08uAg" x="478" y="49"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_qeeMtsFpEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_qeeMt8FpEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_qeeMucFpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_qeeMtsFpEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qeeMt8FpEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qeeMucFpEeaALJQAf08uAg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_qeeMuMFpEeaALJQAf08uAg" x="477" y="-89"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qeeMuMFpEeaALJQAf08uAg" x="477" y="-89"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_aBpSQ8GHEeaALJQAf08uAg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_aBpSRMGHEeaALJQAf08uAg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aBpSRsGHEeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_aBpSQ8GHEeaALJQAf08uAg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aBpSRMGHEeaALJQAf08uAg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aBpSRsGHEeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_aBpSRcGHEeaALJQAf08uAg" x="470" y="158"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aBpSRcGHEeaALJQAf08uAg" x="470" y="158"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_e4LtYMhsEeaVlemTikmRHw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_e4LtYshsEeaVlemTikmRHw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_e4LtY8hsEeaVlemTikmRHw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_e4LtZMhsEeaVlemTikmRHw" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_e4LtYMhsEeaVlemTikmRHw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_e4LtYshsEeaVlemTikmRHw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_e4LtY8hsEeaVlemTikmRHw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_e4LtZMhsEeaVlemTikmRHw" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_e4LtZchsEeaVlemTikmRHw" visible="false" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_J-wK8shtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_l5X4NMhsEeaVlemTikmRHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_J-wK88htEeaVlemTikmRHw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_e4LtZchsEeaVlemTikmRHw" visible="false" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_J-wK8shtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_l5X4NMhsEeaVlemTikmRHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_J-wK88htEeaVlemTikmRHw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_J-wK9MhtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_mvBt1MhsEeaVlemTikmRHw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_J-wK9chtEeaVlemTikmRHw"/>
+        <children xmi:type="notation:Shape" xmi:id="_J-wK9MhtEeaVlemTikmRHw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_mvBt1MhsEeaVlemTikmRHw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_J-wK9chtEeaVlemTikmRHw"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_e4LtZshsEeaVlemTikmRHw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_e4LtZ8hsEeaVlemTikmRHw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_e4LtaMhsEeaVlemTikmRHw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4LtachsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_e4LtZshsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_e4LtZ8hsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_e4LtaMhsEeaVlemTikmRHw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4LtachsEeaVlemTikmRHw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_e4LtashsEeaVlemTikmRHw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_e4Lta8hsEeaVlemTikmRHw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_e4LtbMhsEeaVlemTikmRHw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_e4LtbchsEeaVlemTikmRHw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4LtbshsEeaVlemTikmRHw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_e4LtashsEeaVlemTikmRHw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_e4Lta8hsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_e4LtbMhsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_e4LtbchsEeaVlemTikmRHw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4LtbshsEeaVlemTikmRHw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_e4Ltb8hsEeaVlemTikmRHw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_e4LtcMhsEeaVlemTikmRHw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_e4LtcchsEeaVlemTikmRHw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_e4LtcshsEeaVlemTikmRHw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4Ltc8hsEeaVlemTikmRHw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_e4Ltb8hsEeaVlemTikmRHw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_e4LtcMhsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_e4LtcchsEeaVlemTikmRHw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_e4LtcshsEeaVlemTikmRHw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4Ltc8hsEeaVlemTikmRHw"/>
       </children>
-      <element href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_e4LtYchsEeaVlemTikmRHw" x="13" y="-246" width="408" height="68"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e4LtYchsEeaVlemTikmRHw" x="13" y="-246" width="408" height="68"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_zwoew_lHEeaQEoLj_Ia_cg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_zwoexPlHEeaQEoLj_Ia_cg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_zwoexvlHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_zwoew_lHEeaQEoLj_Ia_cg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zwoexPlHEeaQEoLj_Ia_cg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zwoexvlHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_zwoexflHEeaQEoLj_Ia_cg" x="45" y="-223"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwoexflHEeaQEoLj_Ia_cg" x="45" y="-223"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_9anQwPlHEeaQEoLj_Ia_cg" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_9anQwflHEeaQEoLj_Ia_cg" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_9anQw_lHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_9anQwPlHEeaQEoLj_Ia_cg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9anQwflHEeaQEoLj_Ia_cg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9anQw_lHEeaQEoLj_Ia_cg" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9anQwvlHEeaQEoLj_Ia_cg" x="45" y="-223"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9anQwvlHEeaQEoLj_Ia_cg" x="45" y="-223"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_luMgoBMjEee0L_IMWjydgQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_luMgohMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_luMgoxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_luMgpBMjEee0L_IMWjydgQ" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_luMgoBMjEee0L_IMWjydgQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_luMgohMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_luMgoxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_luMgpBMjEee0L_IMWjydgQ" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_luMgpRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_luMgphMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_luMgpxMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_luMgqBMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgqRMjEee0L_IMWjydgQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_luMgpRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_luMgphMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_luMgpxMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_luMgqBMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgqRMjEee0L_IMWjydgQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_luMgqhMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_luMgqxMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_luMgrBMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_luMgrRMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgrhMjEee0L_IMWjydgQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_luMgqhMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_luMgqxMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_luMgrBMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_luMgrRMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgrhMjEee0L_IMWjydgQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_luMgrxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_luMgsBMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_luMgsRMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_luMgshMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgsxMjEee0L_IMWjydgQ"/>
-      </children>
-      <element href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_luMgoRMjEee0L_IMWjydgQ" x="618" y="78" width="157" height="59"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_luMgrxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_luMgsBMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_luMgsRMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_luMgshMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgsxMjEee0L_IMWjydgQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_luMgoRMjEee0L_IMWjydgQ" x="618" y="78" width="157" height="59"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_6_LyABMjEee0L_IMWjydgQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_6_LyAhMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_6_LyAxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_6_LyBBMjEee0L_IMWjydgQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_6_LyBRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_6_LyBhMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_6_LyBxMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_6_LyCBMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyCRMjEee0L_IMWjydgQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_6_LyChMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_6_LyCxMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_6_LyDBMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_6_LyDRMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyDhMjEee0L_IMWjydgQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_6_LyDxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_6_LyEBMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_6_LyERMjEee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_6_LyEhMjEee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyExMjEee0L_IMWjydgQ"/>
-      </children>
-      <element href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6_LyARMjEee0L_IMWjydgQ" x="837" y="-92" width="185" height="59"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_GbpwIBM2Eee0L_IMWjydgQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_GbpwIhM2Eee0L_IMWjydgQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_GbpwIxM2Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_GbpwJBM2Eee0L_IMWjydgQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_GbpwJRM2Eee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_GbpwJhM2Eee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_GbpwJxM2Eee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_GbpwKBM2Eee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwKRM2Eee0L_IMWjydgQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_GbpwKhM2Eee0L_IMWjydgQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_GbpwKxM2Eee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_GbpwLBM2Eee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_GbpwLRM2Eee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwLhM2Eee0L_IMWjydgQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_GbpwLxM2Eee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_GbpwMBM2Eee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_GbpwMRM2Eee0L_IMWjydgQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_GbpwMhM2Eee0L_IMWjydgQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwMxM2Eee0L_IMWjydgQ"/>
-      </children>
-      <element href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_GbpwIRM2Eee0L_IMWjydgQ" x="549" y="-249" width="133" height="73"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_0AIzM2JqEeek3OrhDuslYQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_0AJaQGJqEeek3OrhDuslYQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0AJaQmJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <children xmi:type="notation:Shape" xmi:id="_6_LyABMjEee0L_IMWjydgQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6_LyAhMjEee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6_LyAxMjEee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6_LyBBMjEee0L_IMWjydgQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6_LyBRMjEee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6_LyBhMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6_LyBxMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6_LyCBMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyCRMjEee0L_IMWjydgQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6_LyChMjEee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6_LyCxMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6_LyDBMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6_LyDRMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyDhMjEee0L_IMWjydgQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6_LyDxMjEee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6_LyEBMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6_LyERMjEee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6_LyEhMjEee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyExMjEee0L_IMWjydgQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_LyARMjEee0L_IMWjydgQ" x="837" y="-92" width="185" height="59"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GbpwIBM2Eee0L_IMWjydgQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GbpwIhM2Eee0L_IMWjydgQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GbpwIxM2Eee0L_IMWjydgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GbpwJBM2Eee0L_IMWjydgQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GbpwJRM2Eee0L_IMWjydgQ" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GbpwJhM2Eee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GbpwJxM2Eee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GbpwKBM2Eee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwKRM2Eee0L_IMWjydgQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GbpwKhM2Eee0L_IMWjydgQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GbpwKxM2Eee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GbpwLBM2Eee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GbpwLRM2Eee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwLhM2Eee0L_IMWjydgQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GbpwLxM2Eee0L_IMWjydgQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GbpwMBM2Eee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GbpwMRM2Eee0L_IMWjydgQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GbpwMhM2Eee0L_IMWjydgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwMxM2Eee0L_IMWjydgQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GbpwIRM2Eee0L_IMWjydgQ" x="549" y="-249" width="133" height="73"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0AIzM2JqEeek3OrhDuslYQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0AJaQGJqEeek3OrhDuslYQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0AJaQmJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_0AJaQWJqEeek3OrhDuslYQ" x="871" y="184"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0AJaQWJqEeek3OrhDuslYQ" x="871" y="184"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IC8_M2NFEee0bPnI-Gt-mQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IC8_NGNFEee0bPnI-Gt-mQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IC8_NmNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_IC8_M2NFEee0bPnI-Gt-mQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IC8_NGNFEee0bPnI-Gt-mQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IC8_NmNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IC8_NWNFEee0bPnI-Gt-mQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IC8_NWNFEee0bPnI-Gt-mQ" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IEdbEGNFEee0bPnI-Gt-mQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IEdbEWNFEee0bPnI-Gt-mQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEdbE2NFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_IEdbEGNFEee0bPnI-Gt-mQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IEdbEWNFEee0bPnI-Gt-mQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IEdbE2NFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEdbEmNFEee0bPnI-Gt-mQ" x="753" y="-212"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IEdbEmNFEee0bPnI-Gt-mQ" x="753" y="-212"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_1ZxusHIYEeeSiaQ95-6r9w" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_1ZyVwHIYEeeSiaQ95-6r9w" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_1ZyVwXIYEeeSiaQ95-6r9w" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ZyVwnIYEeeSiaQ95-6r9w" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_1ZxusHIYEeeSiaQ95-6r9w" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1ZyVwHIYEeeSiaQ95-6r9w" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1ZyVwXIYEeeSiaQ95-6r9w" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1ZyVwnIYEeeSiaQ95-6r9w" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_1ZyVw3IYEeeSiaQ95-6r9w" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_1ZyVxHIYEeeSiaQ95-6r9w"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_1ZyVxXIYEeeSiaQ95-6r9w"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_1ZyVxnIYEeeSiaQ95-6r9w"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZyVx3IYEeeSiaQ95-6r9w"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1ZyVw3IYEeeSiaQ95-6r9w" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1ZyVxHIYEeeSiaQ95-6r9w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1ZyVxXIYEeeSiaQ95-6r9w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1ZyVxnIYEeeSiaQ95-6r9w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZyVx3IYEeeSiaQ95-6r9w"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_1Zy80HIYEeeSiaQ95-6r9w" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_1Zy80XIYEeeSiaQ95-6r9w"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_1Zy80nIYEeeSiaQ95-6r9w"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_1Zy803IYEeeSiaQ95-6r9w"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1Zy81HIYEeeSiaQ95-6r9w"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1Zy80HIYEeeSiaQ95-6r9w" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1Zy80XIYEeeSiaQ95-6r9w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1Zy80nIYEeeSiaQ95-6r9w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zy803IYEeeSiaQ95-6r9w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Zy81HIYEeeSiaQ95-6r9w"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_1Zy81XIYEeeSiaQ95-6r9w" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_1Zy81nIYEeeSiaQ95-6r9w"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_1Zy813IYEeeSiaQ95-6r9w"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_1Zy82HIYEeeSiaQ95-6r9w"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1Zy82XIYEeeSiaQ95-6r9w"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1Zy81XIYEeeSiaQ95-6r9w" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1Zy81nIYEeeSiaQ95-6r9w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1Zy813IYEeeSiaQ95-6r9w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zy82HIYEeeSiaQ95-6r9w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Zy82XIYEeeSiaQ95-6r9w"/>
       </children>
-      <element href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_1ZxusXIYEeeSiaQ95-6r9w" x="571" y="290" width="115" height="56"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZxusXIYEeeSiaQ95-6r9w" x="571" y="290" width="115" height="56"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_3YdyUKLTEeeG6K0eZHmVww" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_3Ym8QKLTEeeG6K0eZHmVww" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_3Ym8QaLTEeeG6K0eZHmVww" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_3Ym8QqLTEeeG6K0eZHmVww" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_3YdyUKLTEeeG6K0eZHmVww" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_3Ym8QKLTEeeG6K0eZHmVww" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3Ym8QaLTEeeG6K0eZHmVww" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3Ym8QqLTEeeG6K0eZHmVww" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_3YnjUKLTEeeG6K0eZHmVww" visible="false" type="Class_AttributeCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_3YnjUaLTEeeG6K0eZHmVww"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_3YnjUqLTEeeG6K0eZHmVww"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_3YnjU6LTEeeG6K0eZHmVww"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YnjVKLTEeeG6K0eZHmVww"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_3YnjUKLTEeeG6K0eZHmVww" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_3YnjUaLTEeeG6K0eZHmVww"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_3YnjUqLTEeeG6K0eZHmVww"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_3YnjU6LTEeeG6K0eZHmVww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YnjVKLTEeeG6K0eZHmVww"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_3YnjVaLTEeeG6K0eZHmVww" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_3YnjVqLTEeeG6K0eZHmVww"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_3YnjV6LTEeeG6K0eZHmVww"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_3YnjWKLTEeeG6K0eZHmVww"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YnjWaLTEeeG6K0eZHmVww"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_3YnjVaLTEeeG6K0eZHmVww" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_3YnjVqLTEeeG6K0eZHmVww"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_3YnjV6LTEeeG6K0eZHmVww"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_3YnjWKLTEeeG6K0eZHmVww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YnjWaLTEeeG6K0eZHmVww"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_3YnjWqLTEeeG6K0eZHmVww" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_3YnjW6LTEeeG6K0eZHmVww"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_3YnjXKLTEeeG6K0eZHmVww"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_3YnjXaLTEeeG6K0eZHmVww"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YnjXqLTEeeG6K0eZHmVww"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_3YnjWqLTEeeG6K0eZHmVww" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_3YnjW6LTEeeG6K0eZHmVww"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_3YnjXKLTEeeG6K0eZHmVww"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_3YnjXaLTEeeG6K0eZHmVww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YnjXqLTEeeG6K0eZHmVww"/>
       </children>
-      <element href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_3YdyUaLTEeeG6K0eZHmVww" x="834" y="-253" width="206" height="64"/>
+      <element xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YdyUaLTEeeG6K0eZHmVww" x="834" y="-253" width="206" height="64"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XcgXkKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XcgXkasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XcgXk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <children xmi:type="notation:Shape" xmi:id="_XcgXkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XcgXkasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XcgXk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XcgXkqsnEeqiJu55eR3W2w" x="78" y="-3"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XcgXkqsnEeqiJu55eR3W2w" x="78" y="-3"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xc5ZIKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xc5ZIasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xc5ZI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xc5ZIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xc5ZIasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xc5ZI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xc5ZIqsnEeqiJu55eR3W2w" x="78" y="-103"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xc5ZIqsnEeqiJu55eR3W2w" x="78" y="-103"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XdGNcKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XdGNcasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdGNc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_XdGNcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XdGNcasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XdGNc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XdGNcqsnEeqiJu55eR3W2w" x="78" y="-103"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XdGNcqsnEeqiJu55eR3W2w" x="78" y="-103"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XdpnEKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XdpnEasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdpnE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <children xmi:type="notation:Shape" xmi:id="_XdpnEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XdpnEasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XdpnE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XdpnEqsnEeqiJu55eR3W2w" x="443" y="1"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XdpnEqsnEeqiJu55eR3W2w" x="443" y="1"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XeCBkKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XeCBkasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XeCBk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XeCBkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XeCBkasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XeCBk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XeCBkqsnEeqiJu55eR3W2w" x="443" y="-99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XeCBkqsnEeqiJu55eR3W2w" x="443" y="-99"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XePc8KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XePc8asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XePc86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_XePc8KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XePc8asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XePc86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XePc8qsnEeqiJu55eR3W2w" x="443" y="-99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XePc8qsnEeqiJu55eR3W2w" x="443" y="-99"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xe4WIKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xe4WIasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xe49MKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xe4WIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xe4WIasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xe49MKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xe4WIqsnEeqiJu55eR3W2w" x="41" y="288"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xe4WIqsnEeqiJu55eR3W2w" x="41" y="288"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XfokEKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XfokEasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XfokE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XfokEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XfokEasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XfokE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XfokEqsnEeqiJu55eR3W2w" x="1041" y="278"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XfokEqsnEeqiJu55eR3W2w" x="1041" y="278"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XgW80KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XgW80asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XgW806snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xmi:type="notation:Shape" xmi:id="_XgW80KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XgW80asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XgW806snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XgW80qsnEeqiJu55eR3W2w" x="358" y="284"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XgW80qsnEeqiJu55eR3W2w" x="358" y="284"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xg36MKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xg36MasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xg36M6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xg36MKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xg36MasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xg36M6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xg36MqsnEeqiJu55eR3W2w" x="42" y="-109"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xg36MqsnEeqiJu55eR3W2w" x="42" y="-109"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XhZeoKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XhZeoasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XhZeo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XhZeoKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XhZeoasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XhZeo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XhZeoqsnEeqiJu55eR3W2w" x="403" y="169"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XhZeoqsnEeqiJu55eR3W2w" x="403" y="169"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xh7qIKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xh7qIasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xh7qI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xh7qIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xh7qIasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xh7qI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xh7qIqsnEeqiJu55eR3W2w" x="348" y="425"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh7qIqsnEeqiJu55eR3W2w" x="348" y="425"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XicngKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XicngasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xicng6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XicngKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XicngasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xicng6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XicngqsnEeqiJu55eR3W2w" x="1043" y="82"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XicngqsnEeqiJu55eR3W2w" x="1043" y="82"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xiu7YKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xiu7YasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xiu7Y6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xiu7YKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xiu7YasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xiu7Y6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xiu7YqsnEeqiJu55eR3W2w" x="1043" y="-18"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xiu7YqsnEeqiJu55eR3W2w" x="1043" y="-18"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xi5TcKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xi5TcasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xi5Tc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xi5TcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xi5TcasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xi5Tc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xi5TcqsnEeqiJu55eR3W2w" x="1043" y="-18"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xi5TcqsnEeqiJu55eR3W2w" x="1043" y="-18"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XjV_YKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XjV_YasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjWmcKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XjV_YKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XjV_YasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XjWmcKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XjV_YqsnEeqiJu55eR3W2w" x="213" y="-246"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XjV_YqsnEeqiJu55eR3W2w" x="213" y="-246"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XjmeEKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XjmeEasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjmeE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XjmeEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XjmeEasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XjmeE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XjmeEqsnEeqiJu55eR3W2w" x="213" y="-346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XjmeEqsnEeqiJu55eR3W2w" x="213" y="-346"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XjvoAKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XjvoAasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjwPEKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XjvoAKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XjvoAasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XjwPEKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XjvoAqsnEeqiJu55eR3W2w" x="213" y="-346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XjvoAqsnEeqiJu55eR3W2w" x="213" y="-346"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xj6nIKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xj6nIasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xj6nI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xj6nIKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xj6nIasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xj6nI6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xj6nIqsnEeqiJu55eR3W2w" x="213" y="-346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xj6nIqsnEeqiJu55eR3W2w" x="213" y="-346"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XkX6IKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XkX6IasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XkX6I6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XkX6IKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XkX6IasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XkX6I6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XkX6IqsnEeqiJu55eR3W2w" x="818" y="78"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkX6IqsnEeqiJu55eR3W2w" x="818" y="78"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XlDPkKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XlDPkasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlDPk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XlDPkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XlDPkasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XlDPk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XlDPkqsnEeqiJu55eR3W2w" x="1037" y="-92"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XlDPkqsnEeqiJu55eR3W2w" x="1037" y="-92"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XlVjcKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XlVjcasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlVjc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XlVjcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XlVjcasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XlVjc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XlVjcqsnEeqiJu55eR3W2w" x="1037" y="-192"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XlVjcqsnEeqiJu55eR3W2w" x="1037" y="-192"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Xlf7gKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Xlf7gasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xlf7g6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+    <children xmi:type="notation:Shape" xmi:id="_Xlf7gKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Xlf7gasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xlf7g6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Xlf7gqsnEeqiJu55eR3W2w" x="1037" y="-192"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xlf7gqsnEeqiJu55eR3W2w" x="1037" y="-192"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XmSlsKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XmSlsasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XmSls6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XmSlsKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XmSlsasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XmSls6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XmSlsqsnEeqiJu55eR3W2w" x="749" y="-249"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XmSlsqsnEeqiJu55eR3W2w" x="749" y="-249"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XnA-cKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XnA-casnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnA-c6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
+    <children xmi:type="notation:Shape" xmi:id="_XnA-cKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XnA-casnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnA-c6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnA-cqsnEeqiJu55eR3W2w" x="771" y="290"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XnA-cqsnEeqiJu55eR3W2w" x="771" y="290"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XnQ2EKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XnQ2EasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnQ2E6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
+    <children xmi:type="notation:Shape" xmi:id="_XnQ2EKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XnQ2EasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnQ2E6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnQ2EqsnEeqiJu55eR3W2w" x="771" y="190"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XnQ2EqsnEeqiJu55eR3W2w" x="771" y="190"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XnXjwKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XnXjwasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnXjw6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
+    <children xmi:type="notation:Shape" xmi:id="_XnXjwKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XnXjwasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnXjw6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnXjwqsnEeqiJu55eR3W2w" x="771" y="190"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XnXjwqsnEeqiJu55eR3W2w" x="771" y="190"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XnxzcKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XnxzcasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xnxzc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XnxzcKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XnxzcasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xnxzc6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XnxzcqsnEeqiJu55eR3W2w" x="1034" y="-253"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XnxzcqsnEeqiJu55eR3W2w" x="1034" y="-253"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XoAc8KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XoAc8asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoAc86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_XoAc8KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XoAc8asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XoAc86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XoAc8qsnEeqiJu55eR3W2w" x="1034" y="-353"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoAc8qsnEeqiJu55eR3W2w" x="1034" y="-353"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_XoIYwKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_XoIYwasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoIYw6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
+    <children xmi:type="notation:Shape" xmi:id="_XoIYwKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_XoIYwasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XoIYw6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_XoIYwqsnEeqiJu55eR3W2w" x="1034" y="-353"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoIYwqsnEeqiJu55eR3W2w" x="1034" y="-353"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_9y8uwTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_9y8uwjBFEeam35bpdXJzEw"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_GGEkQIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_9y8uwTBFEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_9y8uwjBFEeam35bpdXJzEw"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GGEkQIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_BlU3IzBGEeam35bpdXJzEw" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_KvwS4IuOEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_BlU3JDBGEeam35bpdXJzEw"/>
+    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_BlU3IzBGEeam35bpdXJzEw" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_KvwS4IuOEeiu6boZkiJHCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BlU3JDBGEeam35bpdXJzEw"/>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_BlU3JTBGEeam35bpdXJzEw" points="[35, -9, -37, -11]$[72, 29, 0, 27]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_BlU3JjBGEeam35bpdXJzEw" id="(0.68,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_BlU3JzBGEeam35bpdXJzEw" id="(0.4633333333333333,0.2976190476190476)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_aBpSR8GHEeaALJQAf08uAg" type="StereotypeCommentLink" target="_aBpSQ8GHEeaALJQAf08uAg">
-      <styles xsi:type="notation:FontStyle" xmi:id="_aBpSSMGHEeaALJQAf08uAg"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_aBpSTMGHEeaALJQAf08uAg" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BlU3JTBGEeam35bpdXJzEw" points="[35, -9, -37, -11]$[72, 29, 0, 27]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BlU3JjBGEeam35bpdXJzEw" id="(0.68,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BlU3JzBGEeam35bpdXJzEw" id="(0.4633333333333333,0.2976190476190476)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_aBpSR8GHEeaALJQAf08uAg" type="StereotypeCommentLink" target="_aBpSQ8GHEeaALJQAf08uAg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aBpSSMGHEeaALJQAf08uAg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aBpSTMGHEeaALJQAf08uAg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_aBpSScGHEeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aBpSSsGHEeaALJQAf08uAg"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_aBpSS8GHEeaALJQAf08uAg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aBpSScGHEeaALJQAf08uAg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aBpSSsGHEeaALJQAf08uAg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aBpSS8GHEeaALJQAf08uAg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_EYfToBM4Eee0L_IMWjydgQ" type="Dependency_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_GbpwIBM2Eee0L_IMWjydgQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_EYfToxM4Eee0L_IMWjydgQ" type="Dependency_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EYfTpBM4Eee0L_IMWjydgQ" x="3" y="-12"/>
+    <edges xmi:type="notation:Connector" xmi:id="_EYfToBM4Eee0L_IMWjydgQ" type="Dependency_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_GbpwIBM2Eee0L_IMWjydgQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EYfToxM4Eee0L_IMWjydgQ" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EYfTpBM4Eee0L_IMWjydgQ" x="3" y="-12"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_EYfTpRM4Eee0L_IMWjydgQ" type="Dependency_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EYfTphM4Eee0L_IMWjydgQ" x="-7" y="8"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EYfTpRM4Eee0L_IMWjydgQ" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EYfTphM4Eee0L_IMWjydgQ" x="-7" y="8"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_EYfToRM4Eee0L_IMWjydgQ"/>
-      <element href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EYfTohM4Eee0L_IMWjydgQ" points="[305, 3, -189, -2]$[494, 5, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EYfTpxM4Eee0L_IMWjydgQ" id="(1.0,0.4411764705882353)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_EYfTqBM4Eee0L_IMWjydgQ" id="(0.0,0.4383561643835616)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_EYfToRM4Eee0L_IMWjydgQ"/>
+      <element xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EYfTohM4Eee0L_IMWjydgQ" points="[305, 3, -189, -2]$[494, 5, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EYfTpxM4Eee0L_IMWjydgQ" id="(1.0,0.4411764705882353)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EYfTqBM4Eee0L_IMWjydgQ" id="(0.0,0.4383561643835616)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n4p8MCNtEeenc_m30jt0Ow" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_SVZ1oIuOEeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n4p8MSNtEeenc_m30jt0Ow"/>
+    <edges xmi:type="notation:Connector" xmi:id="_n4p8MCNtEeenc_m30jt0Ow" type="Constraint_ConstrainedElementEdge" source="_BlU3yjBGEeam35bpdXJzEw" target="_SVZ1oIuOEeiu6boZkiJHCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_n4p8MSNtEeenc_m30jt0Ow"/>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4p8MiNtEeenc_m30jt0Ow" points="[56, 58, 4, -81]$[139, 139, 87, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6kAsCNtEeenc_m30jt0Ow" id="(0.2,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n6kAsSNtEeenc_m30jt0Ow" id="(0.475,0.5061728395061729)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n4p8MiNtEeenc_m30jt0Ow" points="[56, 58, 4, -81]$[139, 139, 87, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6kAsCNtEeenc_m30jt0Ow" id="(0.2,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6kAsSNtEeenc_m30jt0Ow" id="(0.475,0.5061728395061729)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_UgW_wFqtEeexvMtO2oNM9g" type="InterfaceRealization_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU16TBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_UgW_w1qtEeexvMtO2oNM9g" type="InterfaceRealization_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XVCGcIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UgW_xFqtEeexvMtO2oNM9g" y="40"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UgW_wFqtEeexvMtO2oNM9g" type="InterfaceRealization_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU16TBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UgW_w1qtEeexvMtO2oNM9g" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XVCGcIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UgW_xFqtEeexvMtO2oNM9g" y="40"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_UgW_xVqtEeexvMtO2oNM9g" type="InterfaceRealization_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XW02MIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_UgW_xlqtEeexvMtO2oNM9g" y="60"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UgW_xVqtEeexvMtO2oNM9g" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XW02MIuQEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UgW_xlqtEeexvMtO2oNM9g" y="60"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_UgW_wVqtEeexvMtO2oNM9g"/>
-      <element href="TapiConnectivity.uml#_Uf33kFqtEeexvMtO2oNM9g"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_UgW_wlqtEeexvMtO2oNM9g" points="[13, -209, -643984, -643984]$[-98, -209, -643984, -643984]$[-98, -109, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uh534FqtEeexvMtO2oNM9g" id="(0.0,0.5441176470588235)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Uh534VqtEeexvMtO2oNM9g" id="(0.37037037037037035,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UgW_wVqtEeexvMtO2oNM9g"/>
+      <element xmi:type="uml:InterfaceRealization" href="TapiConnectivity.uml#_Uf33kFqtEeexvMtO2oNM9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UgW_wlqtEeexvMtO2oNM9g" points="[13, -209, -643984, -643984]$[-98, -209, -643984, -643984]$[-98, -109, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uh534FqtEeexvMtO2oNM9g" id="(0.0,0.5441176470588235)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uh534VqtEeexvMtO2oNM9g" id="(0.37037037037037035,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_0AJaQ2JqEeek3OrhDuslYQ" type="StereotypeCommentLink" target="_0AIzM2JqEeek3OrhDuslYQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_0AJaRGJqEeek3OrhDuslYQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_0AJaSGJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_0AJaQ2JqEeek3OrhDuslYQ" type="StereotypeCommentLink" target="_0AIzM2JqEeek3OrhDuslYQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0AJaRGJqEeek3OrhDuslYQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0AJaSGJqEeek3OrhDuslYQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_0AJaRWJqEeek3OrhDuslYQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0AJaRmJqEeek3OrhDuslYQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0AJaR2JqEeek3OrhDuslYQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0AJaRWJqEeek3OrhDuslYQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0AJaRmJqEeek3OrhDuslYQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0AJaR2JqEeek3OrhDuslYQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IC8_N2NFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IC8_M2NFEee0bPnI-Gt-mQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IC8_OGNFEee0bPnI-Gt-mQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IC8_PGNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_IC8_N2NFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IC8_M2NFEee0bPnI-Gt-mQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IC8_OGNFEee0bPnI-Gt-mQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IC8_PGNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_DOEi4O-IEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IC8_OWNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IC8_OmNFEee0bPnI-Gt-mQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IC8_O2NFEee0bPnI-Gt-mQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IC8_OWNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IC8_OmNFEee0bPnI-Gt-mQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IC8_O2NFEee0bPnI-Gt-mQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IEdbFGNFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IEdbEGNFEee0bPnI-Gt-mQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IEdbFWNFEee0bPnI-Gt-mQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEdbGWNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
+    <edges xmi:type="notation:Connector" xmi:id="_IEdbFGNFEee0bPnI-Gt-mQ" type="StereotypeCommentLink" target="_IEdbEGNFEee0bPnI-Gt-mQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IEdbFWNFEee0bPnI-Gt-mQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_IEdbGWNFEee0bPnI-Gt-mQ" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEdbFmNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEdbF2NFEee0bPnI-Gt-mQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEdbGGNFEee0bPnI-Gt-mQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IEdbFmNFEee0bPnI-Gt-mQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IEdbF2NFEee0bPnI-Gt-mQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IEdbGGNFEee0bPnI-Gt-mQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XDTqEHIZEeeSiaQ95-6r9w" type="Abstraction_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_XDURIHIZEeeSiaQ95-6r9w" type="Abstraction_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__j0IEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_XDURIXIZEeeSiaQ95-6r9w" x="-2" y="-12"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XDTqEHIZEeeSiaQ95-6r9w" type="Abstraction_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XDURIHIZEeeSiaQ95-6r9w" type="Abstraction_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__j0IEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDURIXIZEeeSiaQ95-6r9w" x="-2" y="-12"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_XDURInIZEeeSiaQ95-6r9w" type="Abstraction_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="__mfooKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_XDURI3IZEeeSiaQ95-6r9w" x="-2" y="7"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XDURInIZEeeSiaQ95-6r9w" type="Abstraction_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__mfooKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDURI3IZEeeSiaQ95-6r9w" x="-2" y="7"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_XDTqEXIZEeeSiaQ95-6r9w"/>
-      <element href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XDTqEnIZEeeSiaQ95-6r9w" points="[686, 327, -643984, -643984]$[841, 327, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XF65MHIZEeeSiaQ95-6r9w" id="(1.0,0.6607142857142857)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XF65MXIZEeeSiaQ95-6r9w" id="(0.0,0.7777777777777778)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XDTqEXIZEeeSiaQ95-6r9w"/>
+      <element xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XDTqEnIZEeeSiaQ95-6r9w" points="[686, 327, -643984, -643984]$[841, 327, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XF65MHIZEeeSiaQ95-6r9w" id="(1.0,0.6607142857142857)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XF65MXIZEeeSiaQ95-6r9w" id="(0.0,0.7777777777777778)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_DXw14KLUEeeG6K0eZHmVww" type="Dependency_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_GbpwIBM2Eee0L_IMWjydgQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_DXw146LUEeeG6K0eZHmVww" type="Dependency_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DXw15KLUEeeG6K0eZHmVww" x="-2" y="13"/>
+    <edges xmi:type="notation:Connector" xmi:id="_DXw14KLUEeeG6K0eZHmVww" type="Dependency_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_GbpwIBM2Eee0L_IMWjydgQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DXw146LUEeeG6K0eZHmVww" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DXw15KLUEeeG6K0eZHmVww" x="-2" y="13"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DXw15aLUEeeG6K0eZHmVww" type="Dependency_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DXxc8KLUEeeG6K0eZHmVww" x="2" y="-11"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DXw15aLUEeeG6K0eZHmVww" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DXxc8KLUEeeG6K0eZHmVww" x="2" y="-11"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_DXw14aLUEeeG6K0eZHmVww"/>
-      <element href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DXw14qLUEeeG6K0eZHmVww" points="[0, 0, 329, -5]$[-329, 5, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DXyEAKLUEeeG6K0eZHmVww" id="(0.0,0.4375)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_DXyEAaLUEeeG6K0eZHmVww" id="(1.0,0.3150684931506849)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DXw14aLUEeeG6K0eZHmVww"/>
+      <element xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DXw14qLUEeeG6K0eZHmVww" points="[0, 0, 329, -5]$[-329, 5, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DXyEAKLUEeeG6K0eZHmVww" id="(0.0,0.4375)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DXyEAaLUEeeG6K0eZHmVww" id="(1.0,0.3150684931506849)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_9msK4IuNEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0MDBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZAIuNEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZAYuNEeiu6boZkiJHCA" x="-35" y="-1"/>
+    <edges xmi:type="notation:Connector" xmi:id="_9msK4IuNEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0MDBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZAIuNEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZAYuNEeiu6boZkiJHCA" x="-35" y="-1"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZAouNEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZA4uNEeiu6boZkiJHCA" x="-52" y="-1"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZAouNEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZA4uNEeiu6boZkiJHCA" x="-52" y="-1"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZBIuNEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZBYuNEeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZBIuNEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZBYuNEeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZBouNEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZB4uNEeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZBouNEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZB4uNEeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZCIuNEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZCYuNEeiu6boZkiJHCA" x="-16" y="-14"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZCIuNEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZCYuNEeiu6boZkiJHCA" x="-16" y="-14"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_9mtZCouNEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_9mtZC4uNEeiu6boZkiJHCA" x="13" y="16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9mtZCouNEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9mtZC4uNEeiu6boZkiJHCA" x="13" y="16"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_9msx8IuNEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_9msx8YuNEeiu6boZkiJHCA" points="[139, -178, -643984, -643984]$[-15, -3, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-r6GgIuNEeiu6boZkiJHCA" id="(0.031862745098039214,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__L84gIuNEeiu6boZkiJHCA" id="(0.925,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_9msx8IuNEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9msx8YuNEeiu6boZkiJHCA" points="[139, -178, -643984, -643984]$[-15, -3, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-r6GgIuNEeiu6boZkiJHCA" id="(0.031862745098039214,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__L84gIuNEeiu6boZkiJHCA" id="(0.925,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ExLboIuOEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0cTBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCsIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCsYuOEeiu6boZkiJHCA" x="-32" y="3"/>
+    <edges xmi:type="notation:Connector" xmi:id="_ExLboIuOEeiu6boZkiJHCA" type="Association_Edge" source="_e4LtYMhsEeaVlemTikmRHw" target="_BlU0cTBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCsIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCsYuOEeiu6boZkiJHCA" x="-32" y="3"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCsouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCs4uOEeiu6boZkiJHCA" x="-46" y="13"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCsouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCs4uOEeiu6boZkiJHCA" x="-46" y="13"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCtIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCtYuOEeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCtIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCtYuOEeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCtouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCt4uOEeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCtouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCt4uOEeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCuIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMCuYuOEeiu6boZkiJHCA" x="-14" y="18"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCuIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMCuYuOEeiu6boZkiJHCA" x="-14" y="18"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ExMCuouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ExMpwIuOEeiu6boZkiJHCA" x="15" y="-16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ExMCuouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ExMpwIuOEeiu6boZkiJHCA" x="15" y="-16"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_ExLboYuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ExLboouOEeiu6boZkiJHCA" points="[194, -178, -643984, -643984]$[323, 1, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FswTEIuOEeiu6boZkiJHCA" id="(0.9779411764705882,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_GC4UEIuOEeiu6boZkiJHCA" id="(0.8125,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ExLboYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ExLboouOEeiu6boZkiJHCA" points="[194, -178, -643984, -643984]$[323, 1, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FswTEIuOEeiu6boZkiJHCA" id="(0.9779411764705882,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GC4UEIuOEeiu6boZkiJHCA" id="(0.8125,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_KvwS4IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS44uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MWMFMIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS5IuOEeiu6boZkiJHCA" x="1" y="-18"/>
+    <edges xmi:type="notation:Connector" xmi:id="_KvwS4IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS44uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MWMFMIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS5IuOEeiu6boZkiJHCA" x="1" y="-18"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS5YuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MXj-MIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS5ouOEeiu6boZkiJHCA" x="24" y="8"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS5YuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MXj-MIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS5ouOEeiu6boZkiJHCA" x="24" y="8"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS54uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MZOLEIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS6IuOEeiu6boZkiJHCA" x="-50" y="-43"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS54uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MZOLEIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS6IuOEeiu6boZkiJHCA" x="-50" y="-43"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS6YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MahyoIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS6ouOEeiu6boZkiJHCA" x="-65" y="18"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS6YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MahyoIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS6ouOEeiu6boZkiJHCA" x="-65" y="18"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS64uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Mb65wIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS7IuOEeiu6boZkiJHCA" x="12" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS64uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Mb65wIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS7IuOEeiu6boZkiJHCA" x="12" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_KvwS7YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_MdcjwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_KvwS7ouOEeiu6boZkiJHCA" x="-7" y="-13"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KvwS7YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MdcjwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KvwS7ouOEeiu6boZkiJHCA" x="-7" y="-13"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_KvwS4YuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_KvwS4ouOEeiu6boZkiJHCA" points="[381, 1, -643984, -643984]$[381, -26, -643984, -643984]$[262, -26, -643984, -643984]$[262, 1, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_L8aTQIuOEeiu6boZkiJHCA" id="(0.6634615384615384,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_MU2BYIuOEeiu6boZkiJHCA" id="(0.09134615384615384,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_KvwS4YuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ihpPkEwPEeewALXL7BvPYw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KvwS4ouOEeiu6boZkiJHCA" points="[381, 1, -643984, -643984]$[381, -26, -643984, -643984]$[262, -26, -643984, -643984]$[262, 1, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L8aTQIuOEeiu6boZkiJHCA" id="(0.6634615384615384,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MU2BYIuOEeiu6boZkiJHCA" id="(0.09134615384615384,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_SVZ1oIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1o4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVZ1pIuOEeiu6boZkiJHCA" x="-1" y="8"/>
+    <edges xmi:type="notation:Connector" xmi:id="_SVZ1oIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0cTBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1o4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVZ1pIuOEeiu6boZkiJHCA" x="-1" y="8"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1pYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVZ1pouOEeiu6boZkiJHCA" x="-3" y="-15"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1pYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVZ1pouOEeiu6boZkiJHCA" x="-3" y="-15"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1p4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVZ1qIuOEeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1p4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVZ1qIuOEeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SVZ1qYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVacsIuOEeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SVZ1qYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVacsIuOEeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SVacsYuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVacsouOEeiu6boZkiJHCA" x="-18" y="16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SVacsYuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVacsouOEeiu6boZkiJHCA" x="-18" y="16"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SVacs4uOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SVactIuOEeiu6boZkiJHCA" x="20" y="16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SVacs4uOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SVactIuOEeiu6boZkiJHCA" x="20" y="16"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_SVZ1oYuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SVZ1oouOEeiu6boZkiJHCA" points="[38, 33, -643984, -643984]$[243, 28, -643984, -643984]"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SVZ1oYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SVZ1oouOEeiu6boZkiJHCA" points="[38, 33, -643984, -643984]$[243, 28, -643984, -643984]"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YeNm8IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0sjBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOAIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X0qEoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOAYuOEeiu6boZkiJHCA" x="-18" y="4"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOAouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X3tYoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOA4uOEeiu6boZkiJHCA" x="-42" y="6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOBIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X6dxsKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOBYuOEeiu6boZkiJHCA" x="34" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YeOOBouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_X9QnAKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeOOB4uOEeiu6boZkiJHCA" x="-34" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YeO1EIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YAVJIKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeO1EYuOEeiu6boZkiJHCA" x="12" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_YeO1EouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YDJMkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_YeO1E4uOEeiu6boZkiJHCA" x="-17" y="17"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_YeNm8YuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YeNm8ouOEeiu6boZkiJHCA" points="[-33, 60, -643984, -643984]$[-42, 288, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YFD4IKSdEeiKJbr6a5Jjpg" id="(0.48125,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YFD4IaSdEeiKJbr6a5Jjpg" id="(0.6195652173913043,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_akbskIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_akbsk4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bo0hwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_akbslIuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_akbslYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bqIwYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_akbslouOEeiu6boZkiJHCA" x="39" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_akcToIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_breNIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcToYuOEeiu6boZkiJHCA" x="42" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_akcToouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bs0Q8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcTo4uOEeiu6boZkiJHCA" x="-42" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_akcTpIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_buKUwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcTpYuOEeiu6boZkiJHCA" x="11" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_akcTpouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bv_gwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_akcTp4uOEeiu6boZkiJHCA" x="-11" y="-13"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_akbskYuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_akbskouOEeiu6boZkiJHCA" points="[-61, 355, -643984, -643984]$[-61, 456, -643984, -643984]$[148, 456, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnUs8IuOEeiu6boZkiJHCA" id="(0.532608695652174,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnUs8YuOEeiu6boZkiJHCA" id="(0.0,0.5)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_dB1jIIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" lineColor="0">
-      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KMIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XnUMMKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KMYuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KMouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XpG78KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KM4uOEeiu6boZkiJHCA" x="-8" y="-9"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KNIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XrJjUKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KNYuOEeiu6boZkiJHCA" x="22" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KNouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_XtwLYKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KN4uOEeiu6boZkiJHCA" x="-22" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KOIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xv6HgKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KOYuOEeiu6boZkiJHCA" x="10" y="11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dB2KOouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Xx2oQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dB2KO4uOEeiu6boZkiJHCA" x="-11" y="13"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_dB1jIYuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dB1jIouOEeiu6boZkiJHCA" points="[25, 307, -643984, -643984]$[158, 318, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_h1O_cJ_AEeiO_KvaRsULdw" id="(1.0,0.44776119402985076)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_eNCyAIuOEeiu6boZkiJHCA" id="(0.0,0.5483870967741935)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_foWSYIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_foW5couOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gsny0IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5c4uOEeiu6boZkiJHCA" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_foW5dIuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_guA58IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5dYuOEeiu6boZkiJHCA" y="-5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_foW5douOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gvYy8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5d4uOEeiu6boZkiJHCA" x="24" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_foW5eIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gwwE4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5eYuOEeiu6boZkiJHCA" x="-24" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_foW5eouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_gyE6kIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5e4uOEeiu6boZkiJHCA" x="14" y="-21"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_foW5fIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_g0ac4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_foW5fYuOEeiu6boZkiJHCA" x="-11" y="-19"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_foW5cIuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_foW5cYuOEeiu6boZkiJHCA" points="[265, 284, -643984, -643984]$[281, 218, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_grDFgIuOEeiu6boZkiJHCA" id="(0.4117647058823529,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_grDFgYuOEeiu6boZkiJHCA" id="(0.46511627906976744,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_jFNa0IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa04uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YtL10J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa1IuOEeiu6boZkiJHCA" x="-7" y="6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa1YuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_YwzKgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa1ouOEeiu6boZkiJHCA" x="-19" y="11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa14uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y0kQMJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa2IuOEeiu6boZkiJHCA" x="16" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa2YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y4fG4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa2ouOEeiu6boZkiJHCA" x="-16" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa24uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y8HCoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa3IuOEeiu6boZkiJHCA" x="16" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_jFNa3YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Y-ZhoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_jFNa3ouOEeiu6boZkiJHCA" x="-11" y="17"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_jFNa0YuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_jFNa0ouOEeiu6boZkiJHCA" points="[322, 65, -643984, -643984]$[242, 171, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ki1PYIuOEeiu6boZkiJHCA" id="(0.0625,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lUrjEIuOEeiu6boZkiJHCA" id="(0.4108527131782946,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_mliuAIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_mliuA4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuBIuOEeiu6boZkiJHCA" x="-24" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_mliuBYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuBouOEeiu6boZkiJHCA" x="-38" y="-10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_mliuB4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuCIuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_mliuCYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuCouOEeiu6boZkiJHCA" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_mliuC4uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuDIuOEeiu6boZkiJHCA" x="-21" y="-12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_mliuDYuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mliuDouOEeiu6boZkiJHCA" x="22" y="-19"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_mliuAYuOEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_mliuAouOEeiu6boZkiJHCA" points="[341, 65, -643984, -643984]$[347, 284, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oSA24IuOEeiu6boZkiJHCA" id="(0.5480769230769231,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_nnt8sIuOEeiu6boZkiJHCA" id="(0.7803921568627451,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_szL8AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_6_LyABMjEee0L_IMWjydgQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_szL8A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2RUpAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_szL8BIuOEeiu6boZkiJHCA" x="12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_szL8BYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2Ti2kKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_szL8BouOEeiu6boZkiJHCA" x="-13" y="3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_szMjEIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2W00EKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjEYuOEeiu6boZkiJHCA" x="13" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_szMjEouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2aS-0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjE4uOEeiu6boZkiJHCA" x="-14" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_szMjFIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2cvO0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjFYuOEeiu6boZkiJHCA" x="13" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_szMjFouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2e4j4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_szMjF4uOEeiu6boZkiJHCA" x="-14" y="-20"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_szL8AYuOEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_szL8AouOEeiu6boZkiJHCA" points="[934, -189, -643984, -643984]$[937, -94, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_2hvqoKFIEeiKJbr6a5Jjpg" id="(0.4563106796116505,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_23NlsIuOEeiu6boZkiJHCA" id="(0.4918918918918919,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_unw4AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_6_LyABMjEee0L_IMWjydgQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_unw4A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vh_roIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_unw4BIuOEeiu6boZkiJHCA" x="-27" y="-9"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_unxfEIuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vjxNQIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfEYuOEeiu6boZkiJHCA" x="-11" y="-12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_unxfEouOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vlFb4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfE4uOEeiu6boZkiJHCA" x="32" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_unxfFIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vmbfsIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfFYuOEeiu6boZkiJHCA" x="-33" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_unxfFouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vnwVYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfF4uOEeiu6boZkiJHCA" x="14" y="-21"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_unxfGIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_vpFyIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_unxfGYuOEeiu6boZkiJHCA" x="-13" y="-26"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_unw4AYuOEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_unw4AouOEeiu6boZkiJHCA" points="[990, 82, -643984, -643984]$[990, -33, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vgM74IuOEeiu6boZkiJHCA" id="(0.874251497005988,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_vgNi8IuOEeiu6boZkiJHCA" id="(0.8216216216216217,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_yv1goIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_BlU3KDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_yv1go4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_1-ZF8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv1gpIuOEeiu6boZkiJHCA" x="-8" y="10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_yv1gpYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2CrwEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv1gpouOEeiu6boZkiJHCA" x="-23" y="6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HsIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2HFH4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2HsYuOEeiu6boZkiJHCA" x="17" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HsouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2KPJkKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2Hs4uOEeiu6boZkiJHCA" x="-17" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HtIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2MhBgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2HtYuOEeiu6boZkiJHCA" x="11" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_yv2HtouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2PHCgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_yv2Ht4uOEeiu6boZkiJHCA" x="-6" y="16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_yv1goYuOEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_yv1goouOEeiu6boZkiJHCA" points="[870, -33, -643984, -643984]$[870, 82, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0xJ4IIuOEeiu6boZkiJHCA" id="(0.1783783783783784,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_z74dAIuOEeiu6boZkiJHCA" id="(0.16167664670658682,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_4u1OoIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_4u11sIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U2QW8KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11sYuOEeiu6boZkiJHCA" x="23" y="-3"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4u11souOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U4WosKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11s4uOEeiu6boZkiJHCA" x="10" y="-6"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4u11tIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U67bkKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11tYuOEeiu6boZkiJHCA" x="32" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4u11touOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U9aH0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11t4uOEeiu6boZkiJHCA" x="-32" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4u11uIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_U_OFsKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11uYuOEeiu6boZkiJHCA" x="16" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4u11uouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VBOQ0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4u11u4uOEeiu6boZkiJHCA" x="-9" y="19"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_4u1OoYuOEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4u1OoouOEeiu6boZkiJHCA" points="[837, -61, -643984, -643984]$[717, -61, -643984, -643984]$[717, 78, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_5pybAIuOEeiu6boZkiJHCA" id="(0.0,0.5254237288135594)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VDUikKDFEeiO_KvaRsULdw" id="(0.6369426751592356,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8R9-MIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lQIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3NMbYKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lQYuOEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lQouOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3PTUMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lQ4uOEeiu6boZkiJHCA" x="8" y="-5"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lRIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3RcCMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lRYuOEeiu6boZkiJHCA" x="22" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lRouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3TZKAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lR4uOEeiu6boZkiJHCA" x="-22" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lSIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3Vgp4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lSYuOEeiu6boZkiJHCA" x="7" y="-16"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8R-lSouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3XnisKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8R-lS4uOEeiu6boZkiJHCA" x="-11" y="-18"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_8R9-MYuOEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8R9-MouOEeiu6boZkiJHCA" points="[983, 140, -643984, -643984]$[983, 278, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_992RMIuOEeiu6boZkiJHCA" id="(0.8383233532934131,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9kZPYIuOEeiu6boZkiJHCA" id="(0.8304093567251462,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__VTMUIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__VTMU4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3aP_8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTMVIuOEeiu6boZkiJHCA" x="-22" y="-7"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__VTMVYuOEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3dFRgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTMVouOEeiu6boZkiJHCA" x="-40" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__VTzYIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3gIlgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzYYuOEeiu6boZkiJHCA" x="22" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__VTzYouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3it_cKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzY4uOEeiu6boZkiJHCA" x="-22" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__VTzZIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3kxN4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzZYuOEeiu6boZkiJHCA" x="11" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__VTzZouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_3nACgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__VTzZ4uOEeiu6boZkiJHCA" x="-11" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__VTMUYuOEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__VTMUouOEeiu6boZkiJHCA" points="[880, 140, -643984, -643984]$[880, 209, -643984, -643984]$[876, 209, -643984, -643984]$[876, 278, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_AE2Z8IuPEeiu6boZkiJHCA" id="(0.19760479041916168,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_AZkFsIuPEeiu6boZkiJHCA" id="(0.2046783625730994,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_EplwcIuPEeiu6boZkiJHCA" type="Association_Edge" source="_luMgoBMjEee0L_IMWjydgQ" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="0">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Eplwc4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FyRPwIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EplwdIuPEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_EplwdYuPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FzkQQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EplwdouPEeiu6boZkiJHCA" x="-91" y="-2"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Eplwd4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F08JQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXgIuPEeiu6boZkiJHCA" x="34" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_EpmXgYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F2VQYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXgouPEeiu6boZkiJHCA" x="-34" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_EpmXg4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F3pfAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXhIuPEeiu6boZkiJHCA" x="12" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_EpmXhYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_F546sIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_EpmXhouPEeiu6boZkiJHCA" x="-17" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_EplwcYuPEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_EplwcouPEeiu6boZkiJHCA" points="[717, 137, -643984, -643984]$[717, 288, -643984, -643984]$[841, 288, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Fwmb0IuPEeiu6boZkiJHCA" id="(0.6369426751592356,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Fwmb0YuPEeiu6boZkiJHCA" id="(0.0,0.15873015873015872)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IDRpEIuPEeiu6boZkiJHCA" type="Association_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQIYuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JVuIYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDSQIouPEeiu6boZkiJHCA" x="-3" y="-12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQI4uPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JXEzQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDSQJIuPEeiu6boZkiJHCA" y="11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQJYuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JYZo8IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDSQJouPEeiu6boZkiJHCA" x="24" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDSQJ4uPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JZueoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDS3MIuPEeiu6boZkiJHCA" x="-25" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDS3MYuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JbeyIIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDS3MouPEeiu6boZkiJHCA" x="12" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDS3M4uPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_JdinoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDS3NIuPEeiu6boZkiJHCA" x="-6" y="18"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_IDRpEYuPEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IDSQIIuPEeiu6boZkiJHCA" points="[547, 323, -643984, -643984]$[413, 323, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JT8mwIuPEeiu6boZkiJHCA" id="(0.0,0.5892857142857143)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_JT8mwYuPEeiu6boZkiJHCA" id="(1.0,0.6290322580645161)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_SHRdkIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_SHRdk4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VL7hYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHRdlIuPEeiu6boZkiJHCA" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SHRdlYuPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VNUBcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHRdlouPEeiu6boZkiJHCA" x="4" y="11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SHRdl4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VPGxMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEoIuPEeiu6boZkiJHCA" x="50" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SHSEoYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VRQGQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEoouPEeiu6boZkiJHCA" x="-36" y="-12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SHSEo4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VTbQgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEpIuPEeiu6boZkiJHCA" x="8" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_SHSEpYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_VVa0kIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_SHSEpouPEeiu6boZkiJHCA" x="-9" y="9"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_SHRdkYuPEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_B3JLoEHCEeWqPKyD1j6LMg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SHRdkouPEeiu6boZkiJHCA" points="[859, 341, -643984, -643984]$[859, 387, -643984, -643984]$[397, 387, -643984, -643984]$[397, 346, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKNDEIuPEeiu6boZkiJHCA" id="(0.10526315789473684,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_VKNDEYuPEeiu6boZkiJHCA" id="(0.9411764705882353,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ZtSzwIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa0IuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a5-CQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa0YuPEeiu6boZkiJHCA" x="2" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa0ouPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a7VUMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa04uPEeiu6boZkiJHCA" x="-2" y="9"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa1IuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a8rYAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa1YuPEeiu6boZkiJHCA" x="8" y="24"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa1ouPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a-D4EIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa14uPEeiu6boZkiJHCA" x="-60" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa2IuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_a_gpkIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa2YuPEeiu6boZkiJHCA" x="9" y="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZtTa2ouPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_bBeYcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZtTa24uPEeiu6boZkiJHCA" x="-10" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_ZtSzwYuPEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ZtSzwouPEeiu6boZkiJHCA" points="[371, 346, -643984, -643984]$[371, 408, -643984, -643984]$[912, 408, -643984, -643984]$[912, 341, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a4VqkIuPEeiu6boZkiJHCA" id="(0.8392156862745098,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a4WRoIuPEeiu6boZkiJHCA" id="(0.4152046783625731,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ihLEMIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEM4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jik20IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLENIuPEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ihLENYuPEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jj4eYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLENouPEeiu6boZkiJHCA" x="77" y="10"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEN4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jlOiMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEOIuPEeiu6boZkiJHCA" x="96" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEOYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jmmbMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEOouPEeiu6boZkiJHCA" x="-96" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEO4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jn738IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEPIuPEeiu6boZkiJHCA" x="9" y="12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ihLEPYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jpPfgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ihLEPouPEeiu6boZkiJHCA" x="-8" y="12"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_ihLEMYuPEeiu6boZkiJHCA"/>
-      <element href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ihLEMouPEeiu6boZkiJHCA" points="[816, 346, -643984, -643984]$[816, 456, -643984, -643984]$[312, 456, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jgqLQIuPEeiu6boZkiJHCA" id="(0.672514619883041,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_jgqLQYuPEeiu6boZkiJHCA" id="(1.0,0.5)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_WJr-UJ_AEeiO_KvaRsULdw" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="255">
-      <children xsi:type="notation:DecorationNode" xmi:id="_WJslYJ_AEeiO_KvaRsULdw" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jdTwgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJslYZ_AEeiO_KvaRsULdw" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMcJ_AEeiO_KvaRsULdw" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jfgI4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMcZ_AEeiO_KvaRsULdw" x="2" y="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMcp_AEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jhu9gJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMc5_AEeiO_KvaRsULdw" x="15" y="-82"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMdJ_AEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jj3EcJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMdZ_AEeiO_KvaRsULdw" x="-77" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMdp_AEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jmgIwJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMd5_AEeiO_KvaRsULdw" x="8" y="17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_WJtMeJ_AEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jpfLUJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_WJtMeZ_AEeiO_KvaRsULdw" x="-11" y="10"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_WJr-UZ_AEeiO_KvaRsULdw"/>
-      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_WJr-Up_AEeiO_KvaRsULdw" points="[280, 346, -643984, -643984]$[280, 373, -643984, -643984]$[170, 373, -643984, -643984]$[170, 346, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a4aXQJ_AEeiO_KvaRsULdw" id="(0.4823529411764706,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_a2SQUJ_AEeiO_KvaRsULdw" id="(0.047058823529411764,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_snmgYJ_BEeiO_KvaRsULdw" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear" lineColor="255">
-      <children xsi:type="notation:DecorationNode" xmi:id="_snmgY5_BEeiO_KvaRsULdw" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x8HuAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_snmgZJ_BEeiO_KvaRsULdw" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_snnHcJ_BEeiO_KvaRsULdw" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x--NsJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHcZ_BEeiO_KvaRsULdw" x="15" y="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_snnHcp_BEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yA2dAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHc5_BEeiO_KvaRsULdw" x="93" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_snnHdJ_BEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yCsQEJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHdZ_BEeiO_KvaRsULdw" x="-93" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_snnHdp_BEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yEoJwJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHd5_BEeiO_KvaRsULdw" x="10" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_snnHeJ_BEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yGcusJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_snnHeZ_BEeiO_KvaRsULdw" x="-11" y="18"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_snmgYZ_BEeiO_KvaRsULdw"/>
-      <element href="TapiConnectivity.uml#_sWjMoJ_BEeiO_KvaRsULdw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_snmgYp_BEeiO_KvaRsULdw" points="[426, 65, -643984, -643984]$[426, 108, -643984, -643984]$[618, 108, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_stZmYJ_BEeiO_KvaRsULdw" id="(0.875,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_staNcJ_BEeiO_KvaRsULdw" id="(0.0,0.5084745762711864)"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YeNm8IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0MDBGEeam35bpdXJzEw" target="_BlU0sjBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOAIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X0qEoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOAYuOEeiu6boZkiJHCA" x="-18" y="4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOAouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X3tYoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOA4uOEeiu6boZkiJHCA" x="-42" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOBIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X6dxsKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOBYuOEeiu6boZkiJHCA" x="34" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YeOOBouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X9QnAKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeOOB4uOEeiu6boZkiJHCA" x="-34" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YeO1EIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YAVJIKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeO1EYuOEeiu6boZkiJHCA" x="12" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YeO1EouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YDJMkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YeO1E4uOEeiu6boZkiJHCA" x="-17" y="17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YeNm8YuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YeNm8ouOEeiu6boZkiJHCA" points="[-33, 60, -643984, -643984]$[-42, 288, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFD4IKSdEeiKJbr6a5Jjpg" id="(0.48125,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFD4IaSdEeiKJbr6a5Jjpg" id="(0.6195652173913043,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_akbskIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_akbsk4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bo0hwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_akbslIuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_akbslYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bqIwYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_akbslouOEeiu6boZkiJHCA" x="39" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_akcToIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_breNIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcToYuOEeiu6boZkiJHCA" x="42" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_akcToouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bs0Q8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcTo4uOEeiu6boZkiJHCA" x="-42" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_akcTpIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_buKUwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcTpYuOEeiu6boZkiJHCA" x="11" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_akcTpouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bv_gwIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_akcTp4uOEeiu6boZkiJHCA" x="-11" y="-13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_akbskYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_YyfoEGkJEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_akbskouOEeiu6boZkiJHCA" points="[-61, 355, -643984, -643984]$[-61, 456, -643984, -643984]$[148, 456, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bnUs8IuOEeiu6boZkiJHCA" id="(0.532608695652174,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bnUs8YuOEeiu6boZkiJHCA" id="(0.0,0.5)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_dB1jIIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0sjBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KMIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XnUMMKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KMYuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KMouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XpG78KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KM4uOEeiu6boZkiJHCA" x="-8" y="-9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KNIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XrJjUKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KNYuOEeiu6boZkiJHCA" x="22" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KNouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XtwLYKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KN4uOEeiu6boZkiJHCA" x="-22" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KOIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xv6HgKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KOYuOEeiu6boZkiJHCA" x="10" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dB2KOouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xx2oQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dB2KO4uOEeiu6boZkiJHCA" x="-11" y="13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_dB1jIYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dB1jIouOEeiu6boZkiJHCA" points="[25, 307, -643984, -643984]$[158, 318, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h1O_cJ_AEeiO_KvaRsULdw" id="(1.0,0.44776119402985076)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eNCyAIuOEeiu6boZkiJHCA" id="(0.0,0.5483870967741935)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_foWSYIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_foW5couOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gsny0IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5c4uOEeiu6boZkiJHCA" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_foW5dIuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_guA58IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5dYuOEeiu6boZkiJHCA" y="-5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_foW5douOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gvYy8IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5d4uOEeiu6boZkiJHCA" x="24" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_foW5eIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gwwE4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5eYuOEeiu6boZkiJHCA" x="-24" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_foW5eouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gyE6kIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5e4uOEeiu6boZkiJHCA" x="14" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_foW5fIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g0ac4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foW5fYuOEeiu6boZkiJHCA" x="-11" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_foW5cIuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_foW5cYuOEeiu6boZkiJHCA" points="[265, 284, -643984, -643984]$[281, 218, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_grDFgIuOEeiu6boZkiJHCA" id="(0.4117647058823529,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_grDFgYuOEeiu6boZkiJHCA" id="(0.46511627906976744,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jFNa0IuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU2QjBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa04uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YtL10J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa1IuOEeiu6boZkiJHCA" x="-7" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa1YuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YwzKgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa1ouOEeiu6boZkiJHCA" x="-19" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa14uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y0kQMJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa2IuOEeiu6boZkiJHCA" x="16" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa2YuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y4fG4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa2ouOEeiu6boZkiJHCA" x="-16" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa24uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y8HCoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa3IuOEeiu6boZkiJHCA" x="16" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jFNa3YuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y-ZhoJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jFNa3ouOEeiu6boZkiJHCA" x="-11" y="17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_jFNa0YuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jFNa0ouOEeiu6boZkiJHCA" points="[322, 65, -643984, -643984]$[242, 171, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ki1PYIuOEeiu6boZkiJHCA" id="(0.0625,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lUrjEIuOEeiu6boZkiJHCA" id="(0.4108527131782946,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mliuAIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_mliuA4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuBIuOEeiu6boZkiJHCA" x="-24" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mliuBYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuBouOEeiu6boZkiJHCA" x="-38" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mliuB4uOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuCIuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mliuCYuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuCouOEeiu6boZkiJHCA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mliuC4uOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuDIuOEeiu6boZkiJHCA" x="-21" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mliuDYuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mliuDouOEeiu6boZkiJHCA" x="22" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_mliuAYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mliuAouOEeiu6boZkiJHCA" points="[341, 65, -643984, -643984]$[347, 284, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oSA24IuOEeiu6boZkiJHCA" id="(0.5480769230769231,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nnt8sIuOEeiu6boZkiJHCA" id="(0.7803921568627451,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_szL8AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_3YdyUKLTEeeG6K0eZHmVww" target="_6_LyABMjEee0L_IMWjydgQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_szL8A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2RUpAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_szL8BIuOEeiu6boZkiJHCA" x="12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_szL8BYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2Ti2kKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_szL8BouOEeiu6boZkiJHCA" x="-13" y="3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_szMjEIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2W00EKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjEYuOEeiu6boZkiJHCA" x="13" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_szMjEouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2aS-0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjE4uOEeiu6boZkiJHCA" x="-14" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_szMjFIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2cvO0KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjFYuOEeiu6boZkiJHCA" x="13" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_szMjFouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2e4j4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_szMjF4uOEeiu6boZkiJHCA" x="-14" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_szL8AYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_szL8AouOEeiu6boZkiJHCA" points="[934, -189, -643984, -643984]$[937, -94, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2hvqoKFIEeiKJbr6a5Jjpg" id="(0.4563106796116505,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_23NlsIuOEeiu6boZkiJHCA" id="(0.4918918918918919,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_unw4AIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_6_LyABMjEee0L_IMWjydgQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_unw4A4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vh_roIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unw4BIuOEeiu6boZkiJHCA" x="-27" y="-9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_unxfEIuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vjxNQIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfEYuOEeiu6boZkiJHCA" x="-11" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_unxfEouOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vlFb4IuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfE4uOEeiu6boZkiJHCA" x="32" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_unxfFIuOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vmbfsIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfFYuOEeiu6boZkiJHCA" x="-33" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_unxfFouOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vnwVYIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfF4uOEeiu6boZkiJHCA" x="14" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_unxfGIuOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vpFyIIuOEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unxfGYuOEeiu6boZkiJHCA" x="-13" y="-26"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_unw4AYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unw4AouOEeiu6boZkiJHCA" points="[990, 82, -643984, -643984]$[990, -33, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vgM74IuOEeiu6boZkiJHCA" id="(0.874251497005988,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vgNi8IuOEeiu6boZkiJHCA" id="(0.8216216216216217,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yv1goIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_BlU3KDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_yv1go4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1-ZF8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv1gpIuOEeiu6boZkiJHCA" x="-8" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yv1gpYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2CrwEKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv1gpouOEeiu6boZkiJHCA" x="-23" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HsIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2HFH4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2HsYuOEeiu6boZkiJHCA" x="17" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HsouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2KPJkKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2Hs4uOEeiu6boZkiJHCA" x="-17" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HtIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2MhBgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2HtYuOEeiu6boZkiJHCA" x="11" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yv2HtouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2PHCgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yv2Ht4uOEeiu6boZkiJHCA" x="-6" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_yv1goYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yv1goouOEeiu6boZkiJHCA" points="[870, -33, -643984, -643984]$[870, 82, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0xJ4IIuOEeiu6boZkiJHCA" id="(0.1783783783783784,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z74dAIuOEeiu6boZkiJHCA" id="(0.16167664670658682,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_4u1OoIuOEeiu6boZkiJHCA" type="Association_Edge" source="_6_LyABMjEee0L_IMWjydgQ" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4u11sIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U2QW8KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11sYuOEeiu6boZkiJHCA" x="23" y="-3"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4u11souOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U4WosKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11s4uOEeiu6boZkiJHCA" x="10" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4u11tIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U67bkKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11tYuOEeiu6boZkiJHCA" x="32" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4u11touOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U9aH0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11t4uOEeiu6boZkiJHCA" x="-32" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4u11uIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U_OFsKDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11uYuOEeiu6boZkiJHCA" x="16" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4u11uouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VBOQ0KDFEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4u11u4uOEeiu6boZkiJHCA" x="-9" y="19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4u1OoYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4u1OoouOEeiu6boZkiJHCA" points="[837, -61, -643984, -643984]$[717, -61, -643984, -643984]$[717, 78, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5pybAIuOEeiu6boZkiJHCA" id="(0.0,0.5254237288135594)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VDUikKDFEeiO_KvaRsULdw" id="(0.6369426751592356,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_8R9-MIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lQIuOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3NMbYKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lQYuOEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lQouOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3PTUMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lQ4uOEeiu6boZkiJHCA" x="8" y="-5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lRIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3RcCMKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lRYuOEeiu6boZkiJHCA" x="22" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lRouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3TZKAKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lR4uOEeiu6boZkiJHCA" x="-22" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lSIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3Vgp4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lSYuOEeiu6boZkiJHCA" x="7" y="-16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8R-lSouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3XnisKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8R-lS4uOEeiu6boZkiJHCA" x="-11" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8R9-MYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_T3T6ID_NEeWNAdBR30aJhw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8R9-MouOEeiu6boZkiJHCA" points="[983, 140, -643984, -643984]$[983, 278, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_992RMIuOEeiu6boZkiJHCA" id="(0.8383233532934131,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9kZPYIuOEeiu6boZkiJHCA" id="(0.8304093567251462,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__VTMUIuOEeiu6boZkiJHCA" type="Association_Edge" source="_BlU3KDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__VTMU4uOEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3aP_8KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTMVIuOEeiu6boZkiJHCA" x="-22" y="-7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__VTMVYuOEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3dFRgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTMVouOEeiu6boZkiJHCA" x="-40" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__VTzYIuOEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3gIlgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzYYuOEeiu6boZkiJHCA" x="22" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__VTzYouOEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3it_cKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzY4uOEeiu6boZkiJHCA" x="-22" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__VTzZIuOEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3kxN4KFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzZYuOEeiu6boZkiJHCA" x="11" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__VTzZouOEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3nACgKFIEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__VTzZ4uOEeiu6boZkiJHCA" x="-11" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__VTMUYuOEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__VTMUouOEeiu6boZkiJHCA" points="[880, 140, -643984, -643984]$[880, 209, -643984, -643984]$[876, 209, -643984, -643984]$[876, 278, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AE2Z8IuPEeiu6boZkiJHCA" id="(0.19760479041916168,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AZkFsIuPEeiu6boZkiJHCA" id="(0.2046783625730994,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_EplwcIuPEeiu6boZkiJHCA" type="Association_Edge" source="_luMgoBMjEee0L_IMWjydgQ" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Eplwc4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FyRPwIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EplwdIuPEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EplwdYuPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FzkQQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EplwdouPEeiu6boZkiJHCA" x="-91" y="-2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Eplwd4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F08JQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXgIuPEeiu6boZkiJHCA" x="34" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EpmXgYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F2VQYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXgouPEeiu6boZkiJHCA" x="-34" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EpmXg4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F3pfAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXhIuPEeiu6boZkiJHCA" x="12" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EpmXhYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_F546sIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EpmXhouPEeiu6boZkiJHCA" x="-17" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_EplwcYuPEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_tQQ4UGj_EeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EplwcouPEeiu6boZkiJHCA" points="[717, 137, -643984, -643984]$[717, 288, -643984, -643984]$[841, 288, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fwmb0IuPEeiu6boZkiJHCA" id="(0.6369426751592356,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fwmb0YuPEeiu6boZkiJHCA" id="(0.0,0.15873015873015872)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_IDRpEIuPEeiu6boZkiJHCA" type="Association_Edge" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQIYuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JVuIYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDSQIouPEeiu6boZkiJHCA" x="-3" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQI4uPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JXEzQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDSQJIuPEeiu6boZkiJHCA" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQJYuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JYZo8IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDSQJouPEeiu6boZkiJHCA" x="24" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDSQJ4uPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JZueoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDS3MIuPEeiu6boZkiJHCA" x="-25" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDS3MYuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JbeyIIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDS3MouPEeiu6boZkiJHCA" x="12" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDS3M4uPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JdinoIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDS3NIuPEeiu6boZkiJHCA" x="-6" y="18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IDRpEYuPEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IDSQIIuPEeiu6boZkiJHCA" points="[547, 323, -643984, -643984]$[413, 323, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JT8mwIuPEeiu6boZkiJHCA" id="(0.0,0.5892857142857143)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JT8mwYuPEeiu6boZkiJHCA" id="(1.0,0.6290322580645161)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SHRdkIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHRdk4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VL7hYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHRdlIuPEeiu6boZkiJHCA" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHRdlYuPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VNUBcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHRdlouPEeiu6boZkiJHCA" x="4" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHRdl4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VPGxMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEoIuPEeiu6boZkiJHCA" x="50" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHSEoYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VRQGQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEoouPEeiu6boZkiJHCA" x="-36" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHSEo4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VTbQgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEpIuPEeiu6boZkiJHCA" x="8" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHSEpYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VVa0kIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHSEpouPEeiu6boZkiJHCA" x="-9" y="9"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SHRdkYuPEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_B3JLoEHCEeWqPKyD1j6LMg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SHRdkouPEeiu6boZkiJHCA" points="[859, 341, -643984, -643984]$[859, 387, -643984, -643984]$[397, 387, -643984, -643984]$[397, 346, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VKNDEIuPEeiu6boZkiJHCA" id="(0.10526315789473684,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VKNDEYuPEeiu6boZkiJHCA" id="(0.9411764705882353,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZtSzwIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa0IuPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a5-CQIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa0YuPEeiu6boZkiJHCA" x="2" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa0ouPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a7VUMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa04uPEeiu6boZkiJHCA" x="-2" y="9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa1IuPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a8rYAIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa1YuPEeiu6boZkiJHCA" x="8" y="24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa1ouPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a-D4EIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa14uPEeiu6boZkiJHCA" x="-60" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa2IuPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_a_gpkIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa2YuPEeiu6boZkiJHCA" x="9" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtTa2ouPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bBeYcIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZtTa24uPEeiu6boZkiJHCA" x="-10" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZtSzwYuPEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_Zb5MoH5NEeWWkJKpap4S3A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZtSzwouPEeiu6boZkiJHCA" points="[371, 346, -643984, -643984]$[371, 408, -643984, -643984]$[912, 408, -643984, -643984]$[912, 341, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4VqkIuPEeiu6boZkiJHCA" id="(0.8392156862745098,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4WRoIuPEeiu6boZkiJHCA" id="(0.4152046783625731,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ihLEMIuPEeiu6boZkiJHCA" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU2tzBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEM4uPEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jik20IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLENIuPEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ihLENYuPEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jj4eYIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLENouPEeiu6boZkiJHCA" x="77" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEN4uPEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jlOiMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEOIuPEeiu6boZkiJHCA" x="96" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEOYuPEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jmmbMIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEOouPEeiu6boZkiJHCA" x="-96" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEO4uPEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jn738IuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEPIuPEeiu6boZkiJHCA" x="9" y="12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ihLEPYuPEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jpPfgIuPEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ihLEPouPEeiu6boZkiJHCA" x="-8" y="12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ihLEMYuPEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_MM4s4EHBEeWqPKyD1j6LMg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ihLEMouPEeiu6boZkiJHCA" points="[816, 346, -643984, -643984]$[816, 456, -643984, -643984]$[312, 456, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jgqLQIuPEeiu6boZkiJHCA" id="(0.672514619883041,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jgqLQYuPEeiu6boZkiJHCA" id="(1.0,0.5)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_WJr-UJ_AEeiO_KvaRsULdw" type="Association_Edge" source="_BlU1WTBGEeam35bpdXJzEw" target="_BlU1WTBGEeam35bpdXJzEw" routing="Rectilinear" lineColor="255">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WJslYJ_AEeiO_KvaRsULdw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jdTwgJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJslYZ_AEeiO_KvaRsULdw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMcJ_AEeiO_KvaRsULdw" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jfgI4J_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMcZ_AEeiO_KvaRsULdw" x="2" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMcp_AEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jhu9gJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMc5_AEeiO_KvaRsULdw" x="15" y="-82"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMdJ_AEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jj3EcJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMdZ_AEeiO_KvaRsULdw" x="-77" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMdp_AEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jmgIwJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMd5_AEeiO_KvaRsULdw" x="8" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WJtMeJ_AEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jpfLUJ_AEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WJtMeZ_AEeiO_KvaRsULdw" x="-11" y="10"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WJr-UZ_AEeiO_KvaRsULdw"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WJr-Up_AEeiO_KvaRsULdw" points="[280, 346, -643984, -643984]$[280, 373, -643984, -643984]$[170, 373, -643984, -643984]$[170, 346, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4aXQJ_AEeiO_KvaRsULdw" id="(0.4823529411764706,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SQUJ_AEeiO_KvaRsULdw" id="(0.047058823529411764,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_snmgYJ_BEeiO_KvaRsULdw" type="Association_Edge" source="_BlU0cTBGEeam35bpdXJzEw" target="_luMgoBMjEee0L_IMWjydgQ" routing="Rectilinear" lineColor="255">
+      <children xmi:type="notation:DecorationNode" xmi:id="_snmgY5_BEeiO_KvaRsULdw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x8HuAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_snmgZJ_BEeiO_KvaRsULdw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_snnHcJ_BEeiO_KvaRsULdw" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x--NsJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHcZ_BEeiO_KvaRsULdw" x="15" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_snnHcp_BEeiO_KvaRsULdw" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yA2dAJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHc5_BEeiO_KvaRsULdw" x="93" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_snnHdJ_BEeiO_KvaRsULdw" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yCsQEJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHdZ_BEeiO_KvaRsULdw" x="-93" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_snnHdp_BEeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yEoJwJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHd5_BEeiO_KvaRsULdw" x="10" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_snnHeJ_BEeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yGcusJ_BEeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_snnHeZ_BEeiO_KvaRsULdw" x="-11" y="18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_snmgYZ_BEeiO_KvaRsULdw"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_sWjMoJ_BEeiO_KvaRsULdw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_snmgYp_BEeiO_KvaRsULdw" points="[426, 65, -643984, -643984]$[426, 108, -643984, -643984]$[618, 108, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_stZmYJ_BEeiO_KvaRsULdw" id="(0.875,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_staNcJ_BEeiO_KvaRsULdw" id="(0.0,0.5084745762711864)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_8gn2QKSdEeiKJbr6a5Jjpg" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2Q6SdEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_99gD8KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2RKSdEeiKJbr6a5Jjpg" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8gn2QKSdEeiKJbr6a5Jjpg" type="Association_Edge" source="_BlU1BDBGEeam35bpdXJzEw" target="_BlU1BDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2Q6SdEeiKJbr6a5Jjpg" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_99gD8KSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2RKSdEeiKJbr6a5Jjpg" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2RaSdEeiKJbr6a5Jjpg" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9_YTQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2RqSdEeiKJbr6a5Jjpg" x="20" y="30"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2RaSdEeiKJbr6a5Jjpg" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9_YTQKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2RqSdEeiKJbr6a5Jjpg" x="20" y="30"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2R6SdEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-BaTkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2SKSdEeiKJbr6a5Jjpg" x="46" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2R6SdEeiKJbr6a5Jjpg" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-BaTkKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2SKSdEeiKJbr6a5Jjpg" x="46" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2SaSdEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-DjooKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2SqSdEeiKJbr6a5Jjpg" x="-46" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2SaSdEeiKJbr6a5Jjpg" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-DjooKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2SqSdEeiKJbr6a5Jjpg" x="-46" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2S6SdEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-F2HoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2TKSdEeiKJbr6a5Jjpg" x="7" y="18"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2S6SdEeiKJbr6a5Jjpg" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-F2HoKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2TKSdEeiKJbr6a5Jjpg" x="7" y="18"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_8gn2TaSdEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-HrToKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_8gn2TqSdEeiKJbr6a5Jjpg" x="-10" y="11"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8gn2TaSdEeiKJbr6a5Jjpg" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-HrToKSdEeiKJbr6a5Jjpg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gn2TqSdEeiKJbr6a5Jjpg" x="-10" y="11"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_8gn2QaSdEeiKJbr6a5Jjpg"/>
-      <element href="TapiTopology.uml#_G1pfMNnfEeWIOYiRCk5bbQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_8gn2QqSdEeiKJbr6a5Jjpg" points="[1012, 309, -643984, -643984]$[1055, 309, -643984, -643984]$[1055, 370, -643984, -643984]$[988, 370, -643984, -643984]$[988, 341, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_96a6wKSdEeiKJbr6a5Jjpg" id="(1.0,0.49206349206349204)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_96bh0KSdEeiKJbr6a5Jjpg" id="(0.8596491228070176,1.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8gn2QaSdEeiKJbr6a5Jjpg"/>
+      <element xmi:type="uml:Association" href="TapiTopology.uml#_G1pfMNnfEeWIOYiRCk5bbQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8gn2QqSdEeiKJbr6a5Jjpg" points="[1012, 309, -643984, -643984]$[1055, 309, -643984, -643984]$[1055, 370, -643984, -643984]$[988, 370, -643984, -643984]$[988, 341, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96a6wKSdEeiKJbr6a5Jjpg" id="(1.0,0.49206349206349204)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_96bh0KSdEeiKJbr6a5Jjpg" id="(0.8596491228070176,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XcgXlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0MDBGEeam35bpdXJzEw" target="_XcgXkKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XcgXlasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XcgXmasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XcgXlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0MDBGEeam35bpdXJzEw" target="_XcgXkKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XcgXlasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XcgXmasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kuDzQEHaEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XcgXlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XcgXl6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XcgXmKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XcgXlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XcgXl6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XcgXmKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xc5ZJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SVZ1oIuOEeiu6boZkiJHCA" target="_Xc5ZIKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xc6AMKsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xc6ANKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xc5ZJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SVZ1oIuOEeiu6boZkiJHCA" target="_Xc5ZIKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xc6AMKsnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xc6ANKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4ErWsEUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xc6AMasnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xc6AMqsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xc6AM6snEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xc6AMasnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xc6AMqsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xc6AM6snEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XdGNdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_YeNm8IuOEeiu6boZkiJHCA" target="_XdGNcKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XdGNdasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdGNeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XdGNdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_YeNm8IuOEeiu6boZkiJHCA" target="_XdGNcKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XdGNdasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XdGNeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_4Es8MGkIEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XdGNdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdGNd6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdGNeKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XdGNdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XdGNd6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XdGNeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XdpnFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0cTBGEeam35bpdXJzEw" target="_XdpnEKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XdpnFasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XdpnGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XdpnFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0cTBGEeam35bpdXJzEw" target="_XdpnEKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XdpnFasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XdpnGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XdpnFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdpnF6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XdpnGKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XdpnFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XdpnF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XdpnGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XeCBlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_jFNa0IuOEeiu6boZkiJHCA" target="_XeCBkKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XeCBlasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XeCooqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XeCBlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_jFNa0IuOEeiu6boZkiJHCA" target="_XeCBkKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XeCBlasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XeCooqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XeCBlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XeCooKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XeCooasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XeCBlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XeCooKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XeCooasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XePc9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_mliuAIuOEeiu6boZkiJHCA" target="_XePc8KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XePc9asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XePc-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XePc9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_mliuAIuOEeiu6boZkiJHCA" target="_XePc8KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XePc9asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XePc-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XePc9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XePc96snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XePc-KsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XePc9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XePc96snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XePc-KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xe49MasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0sjBGEeam35bpdXJzEw" target="_Xe4WIKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xe49MqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xe49NqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xe49MasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU0sjBGEeam35bpdXJzEw" target="_Xe4WIKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xe49MqsnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xe49NqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xe49M6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xe49NKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xe49NasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xe49M6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xe49NKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xe49NasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XfokFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU1BDBGEeam35bpdXJzEw" target="_XfokEKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XfokFasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XfokGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XfokFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU1BDBGEeam35bpdXJzEw" target="_XfokEKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XfokFasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XfokGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XfokFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XfokF6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XfokGKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XfokFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XfokF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XfokGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XgW81KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU1WTBGEeam35bpdXJzEw" target="_XgW80KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XgW81asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XgW82asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XgW81KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU1WTBGEeam35bpdXJzEw" target="_XgW80KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XgW81asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XgW82asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XgW81qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XgW816snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XgW82KsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XgW81qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XgW816snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XgW82KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xg36NKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU16TBGEeam35bpdXJzEw" target="_Xg36MKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xg36NasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xg36OasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xg36NKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU16TBGEeam35bpdXJzEw" target="_Xg36MKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xg36NasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xg36OasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="TapiConnectivity.uml#_WHPN4FJvEeWcs7ZjyujtOg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xg36NqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xg36N6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xg36OKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xg36NqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xg36N6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xg36OKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XhZepKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU2QjBGEeam35bpdXJzEw" target="_XhZeoKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XhZepasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XhZeqasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XhZepKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU2QjBGEeam35bpdXJzEw" target="_XhZeoKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XhZepasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XhZeqasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XhZepqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XhZep6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XhZeqKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XhZepqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XhZep6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XhZeqKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xh7qJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU2tzBGEeam35bpdXJzEw" target="_Xh7qIKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xh7qJasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xh7qKasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xh7qJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU2tzBGEeam35bpdXJzEw" target="_Xh7qIKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xh7qJasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xh7qKasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xh7qJqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xh7qJ6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xh7qKKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xh7qJqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xh7qJ6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xh7qKKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XicnhKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU3KDBGEeam35bpdXJzEw" target="_XicngKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XicnhasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XicniasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XicnhKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BlU3KDBGEeam35bpdXJzEw" target="_XicngKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XicnhasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XicniasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XicnhqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xicnh6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XicniKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XicnhqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xicnh6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XicniKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xiu7ZKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_unw4AIuOEeiu6boZkiJHCA" target="_Xiu7YKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xiu7ZasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xiu7aasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xiu7ZKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_unw4AIuOEeiu6boZkiJHCA" target="_Xiu7YKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xiu7ZasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xiu7aasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xiu7ZqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xiu7Z6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xiu7aKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xiu7ZqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xiu7Z6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xiu7aKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xi5TdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__VTMUIuOEeiu6boZkiJHCA" target="_Xi5TcKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xi5TdasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xi5TeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xi5TdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__VTMUIuOEeiu6boZkiJHCA" target="_Xi5TcKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xi5TdasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xi5TeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xi5TdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xi5Td6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xi5TeKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xi5TdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xi5Td6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xi5TeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XjWmcasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_e4LtYMhsEeaVlemTikmRHw" target="_XjV_YKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XjWmcqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjWmdqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XjWmcasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_e4LtYMhsEeaVlemTikmRHw" target="_XjV_YKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XjWmcqsnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XjWmdqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_e4FmwMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XjWmc6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjWmdKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjWmdasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XjWmc6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjWmdKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjWmdasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XjmeFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EYfToBM4Eee0L_IMWjydgQ" target="_XjmeEKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XjmeFasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjmeGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XjmeFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EYfToBM4Eee0L_IMWjydgQ" target="_XjmeEKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XjmeFasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XjmeGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_Ju5pkBM2Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XjmeFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjmeF6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjmeGKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XjmeFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjmeF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjmeGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XjwPEasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_9msK4IuNEeiu6boZkiJHCA" target="_XjvoAKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XjwPEqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XjwPFqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XjwPEasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_9msK4IuNEeiu6boZkiJHCA" target="_XjvoAKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XjwPEqsnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XjwPFqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_l5X4MMhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XjwPE6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjwPFKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XjwPFasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XjwPE6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjwPFKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjwPFasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xj6nJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ExLboIuOEeiu6boZkiJHCA" target="_Xj6nIKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xj6nJasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xj6nKasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xj6nJKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ExLboIuOEeiu6boZkiJHCA" target="_Xj6nIKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xj6nJasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xj6nKasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_mvBt0MhsEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xj6nJqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xj6nJ6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xj6nKKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xj6nJqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xj6nJ6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xj6nKKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XkX6JKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_luMgoBMjEee0L_IMWjydgQ" target="_XkX6IKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XkX6JasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XkX6KasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XkX6JKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_luMgoBMjEee0L_IMWjydgQ" target="_XkX6IKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XkX6JasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XkX6KasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XkX6JqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XkX6J6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XkX6KKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XkX6JqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XkX6J6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XkX6KKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XlDPlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_6_LyABMjEee0L_IMWjydgQ" target="_XlDPkKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XlDPlasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlDPmasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XlDPlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_6_LyABMjEee0L_IMWjydgQ" target="_XlDPkKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XlDPlasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XlDPmasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XlDPlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlDPl6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlDPmKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XlDPlqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XlDPl6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XlDPmKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XlVjdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_yv1goIuOEeiu6boZkiJHCA" target="_XlVjcKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XlVjdasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XlVjeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XlVjdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_yv1goIuOEeiu6boZkiJHCA" target="_XlVjcKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XlVjdasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XlVjeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XlVjdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlVjd6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XlVjeKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XlVjdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XlVjd6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XlVjeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Xlf7hKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_4u1OoIuOEeiu6boZkiJHCA" target="_Xlf7gKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Xlf7hasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Xlf7iasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xlf7hKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_4u1OoIuOEeiu6boZkiJHCA" target="_Xlf7gKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xlf7hasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Xlf7iasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Xlf7hqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xlf7h6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xlf7iKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xlf7hqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xlf7h6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xlf7iKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XmSltKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_GbpwIBM2Eee0L_IMWjydgQ" target="_XmSlsKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XmSltasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XmSluasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XmSltKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_GbpwIBM2Eee0L_IMWjydgQ" target="_XmSlsKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XmSltasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XmSluasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XmSltqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XmSlt6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XmSluKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XmSltqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XmSlt6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XmSluKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XnCMkKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_XnA-cKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XnCMkasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnCMlasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XnCMkKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1ZxusHIYEeeSiaQ95-6r9w" target="_XnA-cKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XnCMkasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnCMlasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_1ZroEHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnCMkqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnCMk6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnCMlKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XnCMkqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnCMk6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnCMlKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XnQ2FKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_XDTqEHIZEeeSiaQ95-6r9w" target="_XnQ2EKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XnQ2FasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnQ2GasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XnQ2FKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_XDTqEHIZEeeSiaQ95-6r9w" target="_XnQ2EKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XnQ2FasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnQ2GasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiConnectivity.uml#_XDNjcHIZEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnQ2FqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnQ2F6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnQ2GKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XnQ2FqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnQ2F6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnQ2GKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XnXjxKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_IDRpEIuPEeiu6boZkiJHCA" target="_XnXjwKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XnXjxasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnXjyasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XnXjxKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_IDRpEIuPEeiu6boZkiJHCA" target="_XnXjwKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XnXjxasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnXjyasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__jfwsHIYEeeSiaQ95-6r9w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnXjxqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnXjx6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnXjyKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XnXjxqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnXjx6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnXjyKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XnxzdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3YdyUKLTEeeG6K0eZHmVww" target="_XnxzcKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XnxzdasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XnxzeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XnxzdKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3YdyUKLTEeeG6K0eZHmVww" target="_XnxzcKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XnxzdasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XnxzeasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XnxzdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Xnxzd6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XnxzeKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XnxzdqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xnxzd6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XnxzeKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XoAc9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DXw14KLUEeeG6K0eZHmVww" target="_XoAc8KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XoAc9asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoAc-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XoAc9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DXw14KLUEeeG6K0eZHmVww" target="_XoAc8KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XoAc9asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XoAc-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XoAc9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoAc96snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoAc-KsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XoAc9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XoAc96snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XoAc-KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_XoIYxKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_szL8AIuOEeiu6boZkiJHCA" target="_XoIYwKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_XoIYxasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_XoI_0qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XoIYxKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_szL8AIuOEeiu6boZkiJHCA" target="_XoIYwKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_XoIYxasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XoI_0qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_XoIYxqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoI_0KsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_XoI_0asnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XoIYxqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XoI_0KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XoI_0asnEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_Hdao8DBGEeam35bpdXJzEw" type="PapyrusUMLClassDiagram" name="EndPointDetails" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_LsrifDBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_LsrifTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LsrifjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LsrifzBGEeam35bpdXJzEw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrigDBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_8F9eEKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F9eEaSeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F-FIKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-FIaSeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F-FIqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-FI6SeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F-sMKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sMaSeEeiKJbr6a5Jjpg"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F-sNKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sNaSeEeiKJbr6a5Jjpg"/>
+    <children xmi:type="notation:Shape" xmi:id="_LsrifDBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LsrifTBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LsrifjBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LsrifzBGEeam35bpdXJzEw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrigDBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_8F9eEKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F9eEaSeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_8F-FIKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-FIaSeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_8F-FIqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-FI6SeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_8F-sMKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sMaSeEeiKJbr6a5Jjpg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_8F-sNKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_4c1JUJ--EeiO_KvaRsULdw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sNaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F-sNqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sN6SeEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_8F-sNqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sN6SeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F-sOKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F-sOaSeEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_8F-sOKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F-sOaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F_TQKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TQaSeEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_8F_TQKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TQaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F_TQqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TQ6SeEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_8F_TQqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TQ6SeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F_TRKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TRaSeEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_8F_TRKSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TRaSeEeiKJbr6a5Jjpg"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_8F_TRqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_8F_TR6SeEeiKJbr6a5Jjpg"/>
+        <children xmi:type="notation:Shape" xmi:id="_8F_TRqSeEeiKJbr6a5Jjpg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8F_TR6SeEeiKJbr6a5Jjpg"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrjdjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrjdzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrjeDBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjeTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrjdjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrjdzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrjeDBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjeTBGEeam35bpdXJzEw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrjejBGEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrjezBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrjfDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrjfTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjfjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrjfzBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrjgDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrjgTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrjgjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjgzBGEeam35bpdXJzEw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrjejBGEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrjezBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrjfDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrjfTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjfjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrjfzBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrjgDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrjgTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrjgjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjgzBGEeam35bpdXJzEw"/>
       </children>
-      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrjsTBGEeam35bpdXJzEw" x="-55" y="42" width="435" height="233"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrjsTBGEeam35bpdXJzEw" x="-55" y="42" width="435" height="233"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LsrjxjBGEeam35bpdXJzEw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_LsrjxzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_LsrjyDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_LsrjyTBGEeam35bpdXJzEw" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_LsrjxjBGEeam35bpdXJzEw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LsrjxzBGEeam35bpdXJzEw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LsrjyDBGEeam35bpdXJzEw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LsrjyTBGEeam35bpdXJzEw" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrjyjBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_LsrjyzBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_TlA2g979EeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_Lsrj6jBGEeam35bpdXJzEw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_Lsrj6zBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_TlA2hN79EeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_LsrkCjBGEeam35bpdXJzEw"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrkCzBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrkDDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrkDTBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkDjBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrkDzBGEeam35bpdXJzEw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrkEDBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrkETBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrkEjBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkEzBGEeam35bpdXJzEw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_LsrkFDBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_LsrkFTBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_LsrkFjBGEeam35bpdXJzEw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_LsrkFzBGEeam35bpdXJzEw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkGDBGEeam35bpdXJzEw"/>
-      </children>
-      <element href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LsrkRjBGEeam35bpdXJzEw" x="612" y="92" height="75"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrjyjBGEeam35bpdXJzEw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_LsrjyzBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_TlA2g979EeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Lsrj6jBGEeam35bpdXJzEw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Lsrj6zBGEeam35bpdXJzEw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_TlA2hN79EeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_LsrkCjBGEeam35bpdXJzEw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrkCzBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrkDDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrkDTBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkDjBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrkDzBGEeam35bpdXJzEw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrkEDBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrkETBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrkEjBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkEzBGEeam35bpdXJzEw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LsrkFDBGEeam35bpdXJzEw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LsrkFTBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LsrkFjBGEeam35bpdXJzEw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LsrkFzBGEeam35bpdXJzEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkGDBGEeam35bpdXJzEw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsrkRjBGEeam35bpdXJzEw" x="612" y="92" height="75"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="__g_RQzIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="__g_RRDIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__g_RRjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_VZkuoC6BEea0_JngOlSKcA"/>
+    <children xmi:type="notation:Shape" xmi:id="__g_RQzIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__g_RRDIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__g_RRjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="ecore:EObject" href="TapiCommon.uml#_VZkuoC6BEea0_JngOlSKcA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__g_RRTIvEeamvfKYyWmELQ" x="591" y="597"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__g_RRTIvEeamvfKYyWmELQ" x="591" y="597"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="__hSMPzIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="__hSMQDIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__hSMQjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xmi:type="notation:Shape" xmi:id="__hSMPzIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__hSMQDIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__hSMQjIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__hSMQTIvEeamvfKYyWmELQ" x="731" y="141"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="__iLkJDIvEeamvfKYyWmELQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="__iLkJTIvEeamvfKYyWmELQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__iLkJzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__iLkJjIvEeamvfKYyWmELQ" x="880" y="-5"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_rT034EwEEeewALXL7BvPYw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_rT1e8EwEEeewALXL7BvPYw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rT1e8UwEEeewALXL7BvPYw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rT1e8kwEEeewALXL7BvPYw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rT1e80wEEeewALXL7BvPYw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_9_v1IIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_v1IYoOEeivCevppATXng"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_wcMIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_wcMYoOEeivCevppATXng"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__hSMQTIvEeamvfKYyWmELQ" x="731" y="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__iLkJDIvEeamvfKYyWmELQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__iLkJTIvEeamvfKYyWmELQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__iLkJzIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__iLkJjIvEeamvfKYyWmELQ" x="880" y="-5"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rT034EwEEeewALXL7BvPYw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rT1e8EwEEeewALXL7BvPYw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rT1e8UwEEeewALXL7BvPYw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rT1e8kwEEeewALXL7BvPYw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rT1e80wEEeewALXL7BvPYw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_9_v1IIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nPhusKhLEeeAVfY3jqnvAA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_v1IYoOEeivCevppATXng"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_9_wcMIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_6zHhEIoOEeivCevppATXng"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_wcMYoOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_y4cIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4cYoOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_y4cIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_YyoyAmkJEeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4cYoOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_y4cooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4c4oOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_y4cooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_EN4L8WJREeek3OrhDuslYQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4c4oOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_y4dIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4dYoOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_y4dIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nJqIEUwFEeewALXL7BvPYw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4dYoOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_y4dooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_y4d4oOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_y4dooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTK2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_y4d4oOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_zfgIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfgYoOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_zfgIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MIWTJ2h5EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfgYoOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_zfgooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfg4oOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_zfgooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_207M8IfjEeet-8tHdGGp_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfg4oOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_zfhIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfhYoOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_zfhIoOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfhYoOEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_9_zfhooOEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_9_zfh4oOEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_9_zfhooOEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_zfh4oOEeivCevppATXng"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rT1e9EwEEeewALXL7BvPYw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rT1e9UwEEeewALXL7BvPYw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rT1e9kwEEeewALXL7BvPYw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT1e90wEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rT1e9EwEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rT1e9UwEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rT1e9kwEEeewALXL7BvPYw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT1e90wEEeewALXL7BvPYw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rT1e-EwEEeewALXL7BvPYw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rT1e-UwEEeewALXL7BvPYw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rT1e-kwEEeewALXL7BvPYw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rT1e-0wEEeewALXL7BvPYw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT1e_EwEEeewALXL7BvPYw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rT1e-EwEEeewALXL7BvPYw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rT1e-UwEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rT1e-kwEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rT1e-0wEEeewALXL7BvPYw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT1e_EwEEeewALXL7BvPYw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rT1e_UwEEeewALXL7BvPYw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rT1e_kwEEeewALXL7BvPYw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rT1e_0wEEeewALXL7BvPYw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rT1fAEwEEeewALXL7BvPYw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT1fAUwEEeewALXL7BvPYw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rT1e_UwEEeewALXL7BvPYw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rT1e_kwEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rT1e_0wEEeewALXL7BvPYw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rT1fAEwEEeewALXL7BvPYw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT1fAUwEEeewALXL7BvPYw"/>
       </children>
-      <element href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT034UwEEeewALXL7BvPYw" x="11" y="354" width="306" height="196"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT034UwEEeewALXL7BvPYw" x="11" y="354" width="306" height="196"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_rT-o4EwEEeewALXL7BvPYw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_rT-o4UwEEeewALXL7BvPYw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rT-o40wEEeewALXL7BvPYw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_rT-o4EwEEeewALXL7BvPYw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rT-o4UwEEeewALXL7BvPYw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rT-o40wEEeewALXL7BvPYw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rT-o4kwEEeewALXL7BvPYw" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rT-o4kwEEeewALXL7BvPYw" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n4MtoMZaEeeAD9H5zOiMUQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_n4NUscZaEeeAD9H5zOiMUQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_n4NUssZaEeeAD9H5zOiMUQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_n4NUs8ZaEeeAD9H5zOiMUQ" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="_n4MtoMZaEeeAD9H5zOiMUQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_n4NUscZaEeeAD9H5zOiMUQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n4NUssZaEeeAD9H5zOiMUQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n4NUs8ZaEeeAD9H5zOiMUQ" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_n4NUtMZaEeeAD9H5zOiMUQ" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_o6nz8MZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_7n4Ucqg2EeeAVfY3jqnvAA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_o6nz8cZaEeeAD9H5zOiMUQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_n4NUtMZaEeeAD9H5zOiMUQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_o6nz8MZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_7n4Ucqg2EeeAVfY3jqnvAA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_o6nz8cZaEeeAD9H5zOiMUQ"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_o6obAMZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_7n4Udqg2EeeAVfY3jqnvAA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_o6obAcZaEeeAD9H5zOiMUQ"/>
+        <children xmi:type="notation:Shape" xmi:id="_o6obAMZaEeeAD9H5zOiMUQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_7n4Udqg2EeeAVfY3jqnvAA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_o6obAcZaEeeAD9H5zOiMUQ"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_n4NUtcZaEeeAD9H5zOiMUQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_n4NUtsZaEeeAD9H5zOiMUQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_n4NUt8ZaEeeAD9H5zOiMUQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUuMZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_n4NUtcZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_n4NUtsZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_n4NUt8ZaEeeAD9H5zOiMUQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUuMZaEeeAD9H5zOiMUQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_n4NUucZaEeeAD9H5zOiMUQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_n4NUusZaEeeAD9H5zOiMUQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_n4NUu8ZaEeeAD9H5zOiMUQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_n4NUvMZaEeeAD9H5zOiMUQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUvcZaEeeAD9H5zOiMUQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_n4NUucZaEeeAD9H5zOiMUQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_n4NUusZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_n4NUu8ZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_n4NUvMZaEeeAD9H5zOiMUQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUvcZaEeeAD9H5zOiMUQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_n4NUvsZaEeeAD9H5zOiMUQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_n4NUv8ZaEeeAD9H5zOiMUQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_n4NUwMZaEeeAD9H5zOiMUQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_n4NUwcZaEeeAD9H5zOiMUQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUwsZaEeeAD9H5zOiMUQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_n4NUvsZaEeeAD9H5zOiMUQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_n4NUv8ZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_n4NUwMZaEeeAD9H5zOiMUQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_n4NUwcZaEeeAD9H5zOiMUQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUwsZaEeeAD9H5zOiMUQ"/>
       </children>
-      <element href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4NUsMZaEeeAD9H5zOiMUQ" x="608" y="191" height="84"/>
+      <element xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4NUsMZaEeeAD9H5zOiMUQ" x="608" y="191" height="84"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_n4UCY8ZaEeeAD9H5zOiMUQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_n4UCZMZaEeeAD9H5zOiMUQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4UpcMZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+    <children xmi:type="notation:Shape" xmi:id="_n4UCY8ZaEeeAD9H5zOiMUQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_n4UCZMZaEeeAD9H5zOiMUQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_n4UpcMZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_n4UCZcZaEeeAD9H5zOiMUQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n4UCZcZaEeeAD9H5zOiMUQ" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_lf0UsIuREeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_lf0UsYuREeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_lf0Us4uREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_lf0UsIuREeiu6boZkiJHCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lf0UsYuREeiu6boZkiJHCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lf0Us4uREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lf0UsouREeiu6boZkiJHCA" x="145" y="-58"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lf0UsouREeiu6boZkiJHCA" x="145" y="-58"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_oXd3Q4uREeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_oXd3RIuREeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oXeeUIuREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
+    <children xmi:type="notation:Shape" xmi:id="_oXd3Q4uREeiu6boZkiJHCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oXd3RIuREeiu6boZkiJHCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oXeeUIuREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oXd3RYuREeiu6boZkiJHCA" x="145" y="-58"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oXd3RYuREeiu6boZkiJHCA" x="145" y="-58"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_Hdao8TBGEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_Hdao8jBGEeam35bpdXJzEw"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_HZRRgIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_Hdao8TBGEeam35bpdXJzEw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Hdao8jBGEeam35bpdXJzEw"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HZRRgIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xsi:type="notation:Connector" xmi:id="__hSMQzIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrifDBGEeam35bpdXJzEw" target="__hSMPzIvEeamvfKYyWmELQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="__hSMRDIvEeamvfKYyWmELQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__hSMSDIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="__hSMQzIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrifDBGEeam35bpdXJzEw" target="__hSMPzIvEeamvfKYyWmELQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="__hSMRDIvEeamvfKYyWmELQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__hSMSDIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__hSMRTIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__hSMRjIvEeamvfKYyWmELQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__hSMRzIvEeamvfKYyWmELQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__hSMRTIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__hSMRjIvEeamvfKYyWmELQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__hSMRzIvEeamvfKYyWmELQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__iLkKDIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrjxjBGEeam35bpdXJzEw" target="__iLkJDIvEeamvfKYyWmELQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="__iLkKTIvEeamvfKYyWmELQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="__iLkLTIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
+    <edges xmi:type="notation:Connector" xmi:id="__iLkKDIvEeamvfKYyWmELQ" type="StereotypeCommentLink" source="_LsrjxjBGEeam35bpdXJzEw" target="__iLkJDIvEeamvfKYyWmELQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="__iLkKTIvEeamvfKYyWmELQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__iLkLTIvEeamvfKYyWmELQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_TlA2gN79EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__iLkKjIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="__iLkKzIvEeamvfKYyWmELQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="__iLkLDIvEeamvfKYyWmELQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__iLkKjIvEeamvfKYyWmELQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__iLkKzIvEeamvfKYyWmELQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__iLkLDIvEeamvfKYyWmELQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_rT-o5EwEEeewALXL7BvPYw" type="StereotypeCommentLink" source="_rT034EwEEeewALXL7BvPYw" target="_rT-o4EwEEeewALXL7BvPYw">
-      <styles xsi:type="notation:FontStyle" xmi:id="_rT-o5UwEEeewALXL7BvPYw"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_rT-o6UwEEeewALXL7BvPYw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_rT-o5EwEEeewALXL7BvPYw" type="StereotypeCommentLink" source="_rT034EwEEeewALXL7BvPYw" target="_rT-o4EwEEeewALXL7BvPYw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rT-o5UwEEeewALXL7BvPYw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rT-o6UwEEeewALXL7BvPYw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_rT-o5kwEEeewALXL7BvPYw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rT-o50wEEeewALXL7BvPYw"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_rT-o6EwEEeewALXL7BvPYw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rT-o5kwEEeewALXL7BvPYw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rT-o50wEEeewALXL7BvPYw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rT-o6EwEEeewALXL7BvPYw"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_n4UpccZaEeeAD9H5zOiMUQ" type="StereotypeCommentLink" source="_n4MtoMZaEeeAD9H5zOiMUQ" target="_n4UCY8ZaEeeAD9H5zOiMUQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_n4UpcsZaEeeAD9H5zOiMUQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_n4UpdsZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_n4UpccZaEeeAD9H5zOiMUQ" type="StereotypeCommentLink" source="_n4MtoMZaEeeAD9H5zOiMUQ" target="_n4UCY8ZaEeeAD9H5zOiMUQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_n4UpcsZaEeeAD9H5zOiMUQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_n4UpdsZaEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_n4Upc8ZaEeeAD9H5zOiMUQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4UpdMZaEeeAD9H5zOiMUQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_n4UpdcZaEeeAD9H5zOiMUQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n4Upc8ZaEeeAD9H5zOiMUQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n4UpdMZaEeeAD9H5zOiMUQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n4UpdcZaEeeAD9H5zOiMUQ"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_kIc5IIuREeiu6boZkiJHCA" type="Association_Edge" source="_rT034EwEEeewALXL7BvPYw" target="_LsrifDBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_kIc5I4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIc5JIuREeiu6boZkiJHCA" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_kIc5IIuREeiu6boZkiJHCA" type="Association_Edge" source="_rT034EwEEeewALXL7BvPYw" target="_LsrifDBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kIc5I4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIc5JIuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgMIuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgMYuREeiu6boZkiJHCA" x="1" y="1"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgMIuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgMYuREeiu6boZkiJHCA" x="1" y="1"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgMouREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgM4uREeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgMouREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgM4uREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgNIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgNYuREeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgNIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgNYuREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgNouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgN4uREeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgNouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgN4uREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_kIdgOIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_kIdgOYuREeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kIdgOIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kIdgOYuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_kIc5IYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kIc5IouREeiu6boZkiJHCA" points="[162, 354, -643984, -643984]$[164, 260, -643984, -643984]"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y9G9oJ-_EeiO_KvaRsULdw" id="(0.49885057471264366,1.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_kIc5IYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hF804HIzEeeSiaQ95-6r9w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kIc5IouREeiu6boZkiJHCA" points="[162, 354, -643984, -643984]$[164, 260, -643984, -643984]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y9G9oJ-_EeiO_KvaRsULdw" id="(0.49885057471264366,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_lfoHcIuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_n4MtoMZaEeeAD9H5zOiMUQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_lfoHc4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfougIuREeiu6boZkiJHCA" x="2" y="9"/>
+    <edges xmi:type="notation:Connector" xmi:id="_lfoHcIuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_n4MtoMZaEeeAD9H5zOiMUQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lfoHc4uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfougIuREeiu6boZkiJHCA" x="2" y="9"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lfougYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfougouREeiu6boZkiJHCA" x="-1" y="-9"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lfougYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfougouREeiu6boZkiJHCA" x="-1" y="-9"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lfoug4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouhIuREeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lfoug4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouhIuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lfouhYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouhouREeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lfouhYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouhouREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lfouh4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouiIuREeiu6boZkiJHCA" x="-23" y="16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lfouh4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouiIuREeiu6boZkiJHCA" x="-23" y="16"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_lfouiYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_lfouiouREeiu6boZkiJHCA" x="20" y="18"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lfouiYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lfouiouREeiu6boZkiJHCA" x="20" y="18"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_lfoHcYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_lfoHcouREeiu6boZkiJHCA" points="[380, 179, -643984, -643984]$[608, 209, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_mxDTEIuREeiu6boZkiJHCA" id="(1.0,0.8068669527896996)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_lfoHcYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lfoHcouREeiu6boZkiJHCA" points="[380, 179, -643984, -643984]$[608, 209, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mxDTEIuREeiu6boZkiJHCA" id="(1.0,0.8068669527896996)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_lf0UtIuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_lfoHcIuREeiu6boZkiJHCA" target="_lf0UsIuREeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_lf0UtYuREeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_lf0UuYuREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_lf0UtIuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_lfoHcIuREeiu6boZkiJHCA" target="_lf0UsIuREeiu6boZkiJHCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lf0UtYuREeiu6boZkiJHCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lf0UuYuREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_sGvKoMZaEeeAD9H5zOiMUQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_lf0UtouREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lf0Ut4uREeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_lf0UuIuREeiu6boZkiJHCA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lf0UtouREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lf0Ut4uREeiu6boZkiJHCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lf0UuIuREeiu6boZkiJHCA"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oXRC8IuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrjxjBGEeam35bpdXJzEw">
-      <children xsi:type="notation:DecorationNode" xmi:id="_oXRC84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqAIuREeiu6boZkiJHCA" x="-3" y="10"/>
+    <edges xmi:type="notation:Connector" xmi:id="_oXRC8IuREeiu6boZkiJHCA" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrjxjBGEeam35bpdXJzEw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_oXRC84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqAIuREeiu6boZkiJHCA" x="-3" y="10"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqAYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqAouREeiu6boZkiJHCA" x="-6" y="-6"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqAYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqAouREeiu6boZkiJHCA" x="-6" y="-6"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqBIuREeiu6boZkiJHCA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqBIuREeiu6boZkiJHCA" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqBouREeiu6boZkiJHCA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqBouREeiu6boZkiJHCA" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqCIuREeiu6boZkiJHCA" x="-24" y="17"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqCIuREeiu6boZkiJHCA" x="-24" y="17"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_oXRqCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_oXRqCouREeiu6boZkiJHCA" x="26" y="15"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oXRqCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXRqCouREeiu6boZkiJHCA" x="26" y="15"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_oXRC8YuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oXRC8ouREeiu6boZkiJHCA" points="[380, 142, -643984, -643984]$[612, 133, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_pU-oYIuREeiu6boZkiJHCA" id="(1.0,0.3776824034334764)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_oXRC8YuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oXRC8ouREeiu6boZkiJHCA" points="[380, 142, -643984, -643984]$[612, 133, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pU-oYIuREeiu6boZkiJHCA" id="(1.0,0.3776824034334764)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_oXeeUYuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_oXRC8IuREeiu6boZkiJHCA" target="_oXd3Q4uREeiu6boZkiJHCA">
-      <styles xsi:type="notation:FontStyle" xmi:id="_oXeeUouREeiu6boZkiJHCA"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_oXeeVouREeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_oXeeUYuREeiu6boZkiJHCA" type="StereotypeCommentLink" source="_oXRC8IuREeiu6boZkiJHCA" target="_oXd3Q4uREeiu6boZkiJHCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_oXeeUouREeiu6boZkiJHCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oXeeVouREeiu6boZkiJHCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_TPT-AO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_oXeeU4uREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oXeeVIuREeiu6boZkiJHCA"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_oXeeVYuREeiu6boZkiJHCA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oXeeU4uREeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oXeeVIuREeiu6boZkiJHCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oXeeVYuREeiu6boZkiJHCA"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_4kURYJ--EeiO_KvaRsULdw" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrifDBGEeam35bpdXJzEw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ4J--EeiO_KvaRsULdw" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FZQjgJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ4Z--EeiO_KvaRsULdw" x="1" y="-19"/>
+    <edges xmi:type="notation:Connector" xmi:id="_4kURYJ--EeiO_KvaRsULdw" type="Association_Edge" source="_LsrifDBGEeam35bpdXJzEw" target="_LsrifDBGEeam35bpdXJzEw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ4J--EeiO_KvaRsULdw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FZQjgJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ4Z--EeiO_KvaRsULdw" x="1" y="-19"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ4p--EeiO_KvaRsULdw" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FcdBcJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ45--EeiO_KvaRsULdw" x="-1" y="-11"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ4p--EeiO_KvaRsULdw" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FcdBcJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ45--EeiO_KvaRsULdw" x="-1" y="-11"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ5J--EeiO_KvaRsULdw" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fe-J8J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ5Z--EeiO_KvaRsULdw" x="98" y="-18"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ5J--EeiO_KvaRsULdw" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fe-J8J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ5Z--EeiO_KvaRsULdw" x="98" y="-18"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4kZJ5p--EeiO_KvaRsULdw" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FhvKEJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZJ55--EeiO_KvaRsULdw" x="7" y="-42"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4kZJ5p--EeiO_KvaRsULdw" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FhvKEJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZJ55--EeiO_KvaRsULdw" x="7" y="-42"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4kZw8J--EeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fj-lwJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZw8Z--EeiO_KvaRsULdw" x="12" y="18"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4kZw8J--EeiO_KvaRsULdw" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fj-lwJ-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZw8Z--EeiO_KvaRsULdw" x="12" y="18"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_4kZw8p--EeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fm5W4J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4kZw85--EeiO_KvaRsULdw" x="-11" y="16"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4kZw8p--EeiO_KvaRsULdw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fm5W4J-_EeiO_KvaRsULdw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4kZw85--EeiO_KvaRsULdw" x="-11" y="16"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_4kURYZ--EeiO_KvaRsULdw"/>
-      <element href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4kURYp--EeiO_KvaRsULdw" points="[221, 42, -643984, -643984]$[221, 17, -643984, -643984]$[361, 17, -643984, -643984]$[361, 42, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4rVfYJ--EeiO_KvaRsULdw" id="(0.6344827586206897,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4rVfYZ--EeiO_KvaRsULdw" id="(0.9563218390804598,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4kURYZ--EeiO_KvaRsULdw"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_4Yh4IJ--EeiO_KvaRsULdw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4kURYp--EeiO_KvaRsULdw" points="[221, 42, -643984, -643984]$[221, 17, -643984, -643984]$[361, 17, -643984, -643984]$[361, 42, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4rVfYJ--EeiO_KvaRsULdw" id="(0.6344827586206897,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4rVfYZ--EeiO_KvaRsULdw" id="(0.9563218390804598,0.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_l51YUOr0EeaeHOJw3lCT8A" type="PapyrusUMLClassDiagram" name="Resilience" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_rR8FcOr0EeaeHOJw3lCT8A" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_rSCMEOr0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_rSCMEer0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_rSCMEur0EeaeHOJw3lCT8A" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rSCME-r0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_p3HGgIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3HGgYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3HtkIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3HtkYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3HtkohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3Htk4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3IUoIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUoYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3IUoohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUo4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3IUpIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUpYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3IUpohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUp4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3IUqIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3IUqYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3I7sIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3I7sYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3I7sohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3I7s4hCEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_p3I7tIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_p3I7tYhCEeeOl5P_FBJSmA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rSCMFOr0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rSCMFer0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rSCMFur0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rSCMF-r0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rSCMGOr0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rSCMGer0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rSCMGur0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rSCMG-r0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rSCMHOr0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_rSCMHer0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_rSCMHur0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_rSCMH-r0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_rSCMIOr0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rSCMIer0EeaeHOJw3lCT8A"/>
-      </children>
-      <element href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_rR8Fcer0EeaeHOJw3lCT8A" x="20" y="520" width="521" height="321"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ryFlIOr0EeaeHOJw3lCT8A" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ryFlIur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ryFlI-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ryFlJOr0EeaeHOJw3lCT8A" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ryFlJer0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_e2HOkPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_hSkgNOseEealN7CdLT_GPw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOkfKiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_e2HOkvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_KnJbVPIoEea79czpMf3AVQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOk_KiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_e2HOlPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_jwuBuuryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOlfKiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_e2HOlvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_jwuBwOryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOl_KiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_e2HOmPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_jwuBveryEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_e2HOmfKiEeaAIfPpmDwI5Q"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_bbbI8BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_bbbI8RMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_bbbI8hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_bbbI8xMmEee0L_IMWjydgQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ryFlJur0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ryFlJ-r0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ryFlKOr0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlKer0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ryFlKur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ryFlK-r0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ryFlLOr0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ryFlLer0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlLur0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ryFlL-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ryFlMOr0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ryFlMer0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ryFlMur0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlM-r0EeaeHOJw3lCT8A"/>
-      </children>
-      <element href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ryFlIer0EeaeHOJw3lCT8A" x="706" y="481" width="516" height="241"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_s9Rl4Or0EeaeHOJw3lCT8A" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_s9Rl4ur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_s9Rl4-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_s9Rl5Or0EeaeHOJw3lCT8A" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_s9Rl5er0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_-tUJwPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_wpkK0O38EeaRONVEJOGI1g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_-tUJwfIrEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_-tUJwvIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#__L4hAusYEealN7CdLT_GPw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_-tUJw_IrEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_-tUJxPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_CpfldOsbEealN7CdLT_GPw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_-tUJxfIrEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_a1CowBNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_a1CowRNbEeiKtYjI8wVF7A"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_a1DP0BNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_a1DP0RNbEeiKtYjI8wVF7A"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_s9Rl5ur0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_s9Rl5-r0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_s9Rl6Or0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl6er0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_s9Rl6ur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_s9Rl6-r0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_s9Rl7Or0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_s9Rl7er0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl7ur0EeaeHOJw3lCT8A"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_s9Rl7-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_s9Rl8Or0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_s9Rl8er0EeaeHOJw3lCT8A"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_s9Rl8ur0EeaeHOJw3lCT8A"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl8-r0EeaeHOJw3lCT8A"/>
-      </children>
-      <element href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_s9Rl4er0EeaeHOJw3lCT8A" x="40" y="200" height="175"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_QjgYUOsSEealN7CdLT_GPw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Qjme8OsSEealN7CdLT_GPw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Qjme8esSEealN7CdLT_GPw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Qjme8usSEealN7CdLT_GPw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Qjme8-sSEealN7CdLT_GPw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_V1N2QPIoEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_V1N2QfIoEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_aZys0BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_aZys0RMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_aZys0hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_aZys0xMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_59vBIHJqEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_qqAYYHJqEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_59vBIXJqEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Qjme9OsSEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Qjme9esSEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Qjme9usSEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Qjme9-sSEealN7CdLT_GPw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Qjme-OsSEealN7CdLT_GPw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Qjme-esSEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Qjme-usSEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Qjme--sSEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Qjme_OsSEealN7CdLT_GPw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Qjme_esSEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Qjme_usSEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Qjme_-sSEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_QjmfAOsSEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QjmfAesSEealN7CdLT_GPw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QjgYUesSEealN7CdLT_GPw" x="640" y="-140" width="461" height="141"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_W4xb0OsTEealN7CdLT_GPw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_W43icOsTEealN7CdLT_GPw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_W43icesTEealN7CdLT_GPw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_W43icusTEealN7CdLT_GPw" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_W43ic-sTEealN7CdLT_GPw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_r7GsgOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7GsgesbEealN7CdLT_GPw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_r7GsgusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7Gsg-sbEealN7CdLT_GPw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_r7H6oOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6oesbEealN7CdLT_GPw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_r7H6pOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6pesbEealN7CdLT_GPw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_r7H6pusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6p-sbEealN7CdLT_GPw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_r7H6qOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_r7H6qesbEealN7CdLT_GPw"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_ZbNksBMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_ZbNksRMmEee0L_IMWjydgQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_ZbNkshMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_ZbNksxMmEee0L_IMWjydgQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_W43idOsTEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_W43idesTEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_W43idusTEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W43id-sTEealN7CdLT_GPw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_W43ieOsTEealN7CdLT_GPw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_W43ieesTEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_W43ieusTEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_W43ie-sTEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W43ifOsTEealN7CdLT_GPw"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_W43ifesTEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_W43ifusTEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_W43if-sTEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_W43igOsTEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W43igesTEealN7CdLT_GPw"/>
-      </children>
-      <element href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_W4xb0esTEealN7CdLT_GPw" x="80" y="-320" width="401" height="241"/>
+    <children xmi:type="notation:Shape" xmi:id="_rR8FcOr0EeaeHOJw3lCT8A" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rSCMEOr0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rSCMEer0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rSCMEur0EeaeHOJw3lCT8A" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rSCME-r0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_p3HGgIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_0gCMcIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3HGgYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3HtkIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__jB_0IfTEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3HtkYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3HtkohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_rgC9MIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3Htk4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3IUoIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV4urzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUoYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3IUoohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV5erzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUo4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3IUpIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_MBqV7OrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUpYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3IUpohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_kKvJ4PKiEeaAIfPpmDwI5Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUp4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3IUqIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_zpUU8O4GEeaRONVEJOGI1g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3IUqYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3I7sIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_nuZ_TOryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3I7sYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3I7sohCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_k13kMIfUEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3I7s4hCEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p3I7tIhCEeeOl5P_FBJSmA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_fkqlwIfTEeeirpBaj87qAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3I7tYhCEeeOl5P_FBJSmA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rSCMFOr0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rSCMFer0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rSCMFur0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMF-r0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rSCMGOr0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rSCMGer0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rSCMGur0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rSCMG-r0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMHOr0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rSCMHer0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rSCMHur0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rSCMH-r0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rSCMIOr0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rSCMIer0EeaeHOJw3lCT8A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rR8Fcer0EeaeHOJw3lCT8A" x="20" y="520" width="521" height="321"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ryFlIOr0EeaeHOJw3lCT8A" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ryFlIur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ryFlI-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ryFlJOr0EeaeHOJw3lCT8A" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ryFlJer0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_e2HOkPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_hSkgNOseEealN7CdLT_GPw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOkfKiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_e2HOkvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_KnJbVPIoEea79czpMf3AVQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOk_KiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_e2HOlPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_jwuBuuryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOlfKiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_e2HOlvKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_jwuBwOryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOl_KiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_e2HOmPKiEeaAIfPpmDwI5Q" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_jwuBveryEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_e2HOmfKiEeaAIfPpmDwI5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_bbbI8BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_bbbI8RMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_bbbI8hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_bbbI8xMmEee0L_IMWjydgQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ryFlJur0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ryFlJ-r0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ryFlKOr0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlKer0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ryFlKur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ryFlK-r0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ryFlLOr0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ryFlLer0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlLur0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ryFlL-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ryFlMOr0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ryFlMer0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ryFlMur0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlM-r0EeaeHOJw3lCT8A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ryFlIer0EeaeHOJw3lCT8A" x="706" y="481" width="516" height="241"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_s9Rl4Or0EeaeHOJw3lCT8A" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_s9Rl4ur0EeaeHOJw3lCT8A" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_s9Rl4-r0EeaeHOJw3lCT8A" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_s9Rl5Or0EeaeHOJw3lCT8A" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s9Rl5er0EeaeHOJw3lCT8A" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_-tUJwPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_wpkK0O38EeaRONVEJOGI1g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-tUJwfIrEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_-tUJwvIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__L4hAusYEealN7CdLT_GPw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-tUJw_IrEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_-tUJxPIrEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_CpfldOsbEealN7CdLT_GPw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-tUJxfIrEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_a1CowBNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_a1CowRNbEeiKtYjI8wVF7A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_a1DP0BNbEeiKtYjI8wVF7A" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_a1DP0RNbEeiKtYjI8wVF7A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s9Rl5ur0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_s9Rl5-r0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_s9Rl6Or0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl6er0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s9Rl6ur0EeaeHOJw3lCT8A" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s9Rl6-r0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_s9Rl7Or0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_s9Rl7er0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl7ur0EeaeHOJw3lCT8A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s9Rl7-r0EeaeHOJw3lCT8A" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s9Rl8Or0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_s9Rl8er0EeaeHOJw3lCT8A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_s9Rl8ur0EeaeHOJw3lCT8A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl8-r0EeaeHOJw3lCT8A"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Rl4er0EeaeHOJw3lCT8A" x="40" y="200" height="175"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QjgYUOsSEealN7CdLT_GPw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Qjme8OsSEealN7CdLT_GPw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Qjme8esSEealN7CdLT_GPw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Qjme8usSEealN7CdLT_GPw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Qjme8-sSEealN7CdLT_GPw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_V1N2QPIoEea79czpMf3AVQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_p40DAEUeEeWEwNCluy4jrw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V1N2QfIoEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aZys0BMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_dlarAN8qEeWT9tG0gGLRFw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aZys0RMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aZys0hMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_MP7aAJLQEeaqpNd__7dv4w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aZys0xMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_59vBIHJqEeq3NYg-TXSAxQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_qqAYYHJqEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_59vBIXJqEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Qjme9OsSEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Qjme9esSEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Qjme9usSEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qjme9-sSEealN7CdLT_GPw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Qjme-OsSEealN7CdLT_GPw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Qjme-esSEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Qjme-usSEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Qjme--sSEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qjme_OsSEealN7CdLT_GPw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Qjme_esSEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Qjme_usSEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Qjme_-sSEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QjmfAOsSEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjmfAesSEealN7CdLT_GPw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjgYUesSEealN7CdLT_GPw" x="640" y="-140" width="461" height="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_W4xb0OsTEealN7CdLT_GPw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_W43icOsTEealN7CdLT_GPw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_W43icesTEealN7CdLT_GPw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_W43icusTEealN7CdLT_GPw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_W43ic-sTEealN7CdLT_GPw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_r7GsgOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ijcPo2kHEeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7GsgesbEealN7CdLT_GPw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_r7GsgusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ZiYSAEUcEeWEwNCluy4jrw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7Gsg-sbEealN7CdLT_GPw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_r7H6oOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_QZdZkusUEealN7CdLT_GPw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6oesbEealN7CdLT_GPw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_r7H6pOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B0rIk-_sEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6pesbEealN7CdLT_GPw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_r7H6pusbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IZ3vc0HbEeWqPKyD1j6LMg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6p-sbEealN7CdLT_GPw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_r7H6qOsbEealN7CdLT_GPw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_V2I0INnlEeWIOYiRCk5bbQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_r7H6qesbEealN7CdLT_GPw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ZbNksBMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZbNksRMmEee0L_IMWjydgQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ZbNkshMmEee0L_IMWjydgQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZbNksxMmEee0L_IMWjydgQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_W43idOsTEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_W43idesTEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_W43idusTEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43id-sTEealN7CdLT_GPw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_W43ieOsTEealN7CdLT_GPw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_W43ieesTEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_W43ieusTEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_W43ie-sTEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43ifOsTEealN7CdLT_GPw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_W43ifesTEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_W43ifusTEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_W43if-sTEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_W43igOsTEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W43igesTEealN7CdLT_GPw"/>
+      </children>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W4xb0esTEealN7CdLT_GPw" x="80" y="-320" width="401" height="241"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_jHqrg-scEealN7CdLT_GPw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_jHqrhOscEealN7CdLT_GPw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_jHqrhuscEealN7CdLT_GPw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_jHqrg-scEealN7CdLT_GPw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jHqrhOscEealN7CdLT_GPw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jHqrhuscEealN7CdLT_GPw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jHqrhescEealN7CdLT_GPw" x="742" y="-100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jHqrhescEealN7CdLT_GPw" x="742" y="-100"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="__j6psOscEealN7CdLT_GPw" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="__j6psuscEealN7CdLT_GPw" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="__j6ps-scEealN7CdLT_GPw" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__j6ptOscEealN7CdLT_GPw" y="5"/>
+    <children xmi:type="notation:Shape" xmi:id="__j6psOscEealN7CdLT_GPw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__j6psuscEealN7CdLT_GPw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__j6ps-scEealN7CdLT_GPw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__j6ptOscEealN7CdLT_GPw" y="5"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__j6ptescEealN7CdLT_GPw" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_B6U0UIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6U0UYoPEeivCevppATXng"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__j6ptescEealN7CdLT_GPw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_B6U0UIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_IOhXAKeWEeeBGPv_1DT5og"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6U0UYoPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6VbYIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbYYoPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6VbYIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_ypGF8IoOEeivCevppATXng"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbYYoPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6VbYooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_hHpeAHIzEeeSiaQ95-6r9w"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbY4oPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6VbYooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_hHpeAHIzEeeSiaQ95-6r9w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbY4oPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6VbZIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbZYoPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6VbZIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_B3Ln4EHCEeWqPKyD1j6LMg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbZYoPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6VbZooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6VbZ4oPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6VbZooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_Zb_6UH5NEeWWkJKpap4S3A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6VbZ4oPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6WCcIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCcYoPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6WCcIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_TPT-A-_tEeWLlrwIF3w0vA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCcYoPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6WCcooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCc4oPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6WCcooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sGvxssZaEeeAD9H5zOiMUQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCc4oPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6WCdIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCdYoPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6WCdIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutK2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCdYoPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6WCdooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WCd4oPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6WCdooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_sIutJ2h-EeWZEqTYAF8eqA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WCd4oPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6WpgIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6WpgYoPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6WpgIoPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjm98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6WpgYoPEeivCevppATXng"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_B6WpgooPEeivCevppATXng" type="Property_ClassAttributeLabel">
-          <element href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_B6Wpg4oPEeivCevppATXng"/>
+        <children xmi:type="notation:Shape" xmi:id="_B6WpgooPEeivCevppATXng" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiCommon.uml#_xEvjn98AEeW-BtRsuJPbqg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6Wpg4oPEeivCevppATXng"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="__j6ptuscEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__j6pt-scEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__j6puOscEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6puescEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__j6ptuscEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__j6pt-scEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__j6puOscEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6puescEealN7CdLT_GPw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__j6puuscEealN7CdLT_GPw" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__j6pu-scEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__j6pvOscEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__j6pvescEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6pvuscEealN7CdLT_GPw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__j6puuscEealN7CdLT_GPw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__j6pu-scEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__j6pvOscEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__j6pvescEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6pvuscEealN7CdLT_GPw"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="__j6pv-scEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="__j6pwOscEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="__j6pwescEealN7CdLT_GPw"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="__j6pwuscEealN7CdLT_GPw"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6pw-scEealN7CdLT_GPw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__j6pv-scEealN7CdLT_GPw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__j6pwOscEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__j6pwescEealN7CdLT_GPw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__j6pwuscEealN7CdLT_GPw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6pw-scEealN7CdLT_GPw"/>
       </children>
-      <element href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="__j6psescEealN7CdLT_GPw" x="1260" y="-320" width="601" height="321"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j6psescEealN7CdLT_GPw" x="1260" y="-320" width="601" height="321"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_hU2_M-seEealN7CdLT_GPw" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_hU2_NOseEealN7CdLT_GPw" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_hU2_NuseEealN7CdLT_GPw" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
+    <children xmi:type="notation:Shape" xmi:id="_hU2_M-seEealN7CdLT_GPw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hU2_NOseEealN7CdLT_GPw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hU2_NuseEealN7CdLT_GPw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_hU2_NeseEealN7CdLT_GPw" x="538" y="25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hU2_NeseEealN7CdLT_GPw" x="538" y="25"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_wq5nk-38EeaRONVEJOGI1g" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_wq5nlO38EeaRONVEJOGI1g" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_wq5nlu38EeaRONVEJOGI1g" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
+    <children xmi:type="notation:Shape" xmi:id="_wq5nk-38EeaRONVEJOGI1g" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wq5nlO38EeaRONVEJOGI1g" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wq5nlu38EeaRONVEJOGI1g" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wq5nle38EeaRONVEJOGI1g" x="221" y="-89"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wq5nle38EeaRONVEJOGI1g" x="221" y="-89"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_sI850-4REeaRONVEJOGI1g" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_sI851O4REeaRONVEJOGI1g" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_sI851u4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_sI850-4REeaRONVEJOGI1g" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_sI851O4REeaRONVEJOGI1g" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sI851u4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_sI851e4REeaRONVEJOGI1g" x="535" y="43"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sI851e4REeaRONVEJOGI1g" x="535" y="43"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_SXpJ7PItEea79czpMf3AVQ" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_SXpJ7fItEea79czpMf3AVQ" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SXpJ7_ItEea79czpMf3AVQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
+    <children xmi:type="notation:Shape" xmi:id="_SXpJ7PItEea79czpMf3AVQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SXpJ7fItEea79czpMf3AVQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SXpJ7_ItEea79czpMf3AVQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_SXpJ7vItEea79czpMf3AVQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXpJ7vItEea79czpMf3AVQ" x="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_6FhDgPLAEeaAIfPpmDwI5Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_6FhDgfLAEeaAIfPpmDwI5Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6FhDg_LAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
+    <children xmi:type="notation:Shape" xmi:id="_6FhDgPLAEeaAIfPpmDwI5Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6FhDgfLAEeaAIfPpmDwI5Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6FhDg_LAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6FhDgvLAEeaAIfPpmDwI5Q" x="713" y="-95"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FhDgvLAEeaAIfPpmDwI5Q" x="713" y="-95"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_QYR48_LXEeaAIfPpmDwI5Q" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_QYR49PLXEeaAIfPpmDwI5Q" showTitle="true"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_QYR49vLXEeaAIfPpmDwI5Q" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_QYR48_LXEeaAIfPpmDwI5Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QYR49PLXEeaAIfPpmDwI5Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_QYR49vLXEeaAIfPpmDwI5Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QYR49fLXEeaAIfPpmDwI5Q" x="695" y="-111"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QYR49fLXEeaAIfPpmDwI5Q" x="695" y="-111"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_LmxJ0HJqEeq3NYg-TXSAxQ" type="Class_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Lmxw4HJqEeq3NYg-TXSAxQ" type="Class_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Lmxw4XJqEeq3NYg-TXSAxQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Lmxw4nJqEeq3NYg-TXSAxQ" y="15"/>
+    <children xmi:type="notation:Shape" xmi:id="_LmxJ0HJqEeq3NYg-TXSAxQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lmxw4HJqEeq3NYg-TXSAxQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lmxw4XJqEeq3NYg-TXSAxQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lmxw4nJqEeq3NYg-TXSAxQ" y="15"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Lmxw43JqEeq3NYg-TXSAxQ" type="Class_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_kC0fYKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#__RAuEnJpEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_kC0fYaZnEeqJcvXkREZ1XQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw43JqEeq3NYg-TXSAxQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_kC0fYKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuEnJpEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kC0fYaZnEeqJcvXkREZ1XQ"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_kC1GcKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
-          <element href="TapiConnectivity.uml#__RAuFXJpEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_kC1GcaZnEeqJcvXkREZ1XQ"/>
+        <children xmi:type="notation:Shape" xmi:id="_kC1GcKZnEeqJcvXkREZ1XQ" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#__RAuFXJpEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kC1GcaZnEeqJcvXkREZ1XQ"/>
         </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Lmxw5HJqEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Lmxw5XJqEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Lmxw5nJqEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lmxw53JqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw5HJqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw5XJqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Lmxw5nJqEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw53JqEeq3NYg-TXSAxQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Lmxw6HJqEeq3NYg-TXSAxQ" type="Class_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Lmxw6XJqEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Lmxw6nJqEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Lmxw63JqEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lmxw7HJqEeq3NYg-TXSAxQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw6HJqEeq3NYg-TXSAxQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw6XJqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw6nJqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Lmxw63JqEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw7HJqEeq3NYg-TXSAxQ"/>
       </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Lmxw7XJqEeq3NYg-TXSAxQ" type="Class_NestedClassifierCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Lmxw7nJqEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Lmxw73JqEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Lmxw8HJqEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Lmxw8XJqEeq3NYg-TXSAxQ"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lmxw7XJqEeq3NYg-TXSAxQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Lmxw7nJqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Lmxw73JqEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Lmxw8HJqEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lmxw8XJqEeq3NYg-TXSAxQ"/>
       </children>
-      <element href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_LmxJ0XJqEeq3NYg-TXSAxQ" x="820" y="140" width="381" height="121"/>
+      <element xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LmxJ0XJqEeq3NYg-TXSAxQ" x="820" y="140" width="381" height="121"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YMb_sKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YMb_sasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YMb_s6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <children xmi:type="notation:Shape" xmi:id="_YMb_sKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YMb_sasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YMb_s6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YMb_sqsnEeqiJu55eR3W2w" x="220" y="520"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMb_sqsnEeqiJu55eR3W2w" x="220" y="520"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YOTn8KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YOTn8asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YOTn86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
+    <children xmi:type="notation:Shape" xmi:id="_YOTn8KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YOTn8asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YOTn86snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YOTn8qsnEeqiJu55eR3W2w" x="906" y="481"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOTn8qsnEeqiJu55eR3W2w" x="906" y="481"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YPf6wKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YPf6wasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YPf6w6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
+    <children xmi:type="notation:Shape" xmi:id="_YPf6wKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YPf6wasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YPf6w6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YPf6wqsnEeqiJu55eR3W2w" x="240" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YPf6wqsnEeqiJu55eR3W2w" x="240" y="200"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YQRW0KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YQRW0asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQR94KsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
+    <children xmi:type="notation:Shape" xmi:id="_YQRW0KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YQRW0asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YQR94KsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YQRW0qsnEeqiJu55eR3W2w" x="240" y="100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YQRW0qsnEeqiJu55eR3W2w" x="240" y="100"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YQYrkKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YQYrkasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQYrk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
+    <children xmi:type="notation:Shape" xmi:id="_YQYrkKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YQYrkasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YQYrk6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YQYrkqsnEeqiJu55eR3W2w" x="240" y="100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YQYrkqsnEeqiJu55eR3W2w" x="240" y="100"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YQv38KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YQv38asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQv386snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_YQv38KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YQv38asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YQv386snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YQv38qsnEeqiJu55eR3W2w" x="840" y="-140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YQv38qsnEeqiJu55eR3W2w" x="840" y="-140"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YRYKEKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YRYKEasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRYKE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_YRYKEKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YRYKEasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YRYKE6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YRYKEqsnEeqiJu55eR3W2w" x="840" y="-240"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YRYKEqsnEeqiJu55eR3W2w" x="840" y="-240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YRzA0KsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YRzA0asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRzA06snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <children xmi:type="notation:Shape" xmi:id="_YRzA0KsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YRzA0asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YRzA06snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YRzA0qsnEeqiJu55eR3W2w" x="280" y="-320"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YRzA0qsnEeqiJu55eR3W2w" x="280" y="-320"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YS0UgKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YS0UgasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS07kKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
+    <children xmi:type="notation:Shape" xmi:id="_YS0UgKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YS0UgasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YS07kKsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YS0UgqsnEeqiJu55eR3W2w" x="280" y="-420"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YS0UgqsnEeqiJu55eR3W2w" x="280" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YS8QUKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YS8QUasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS8QU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <children xmi:type="notation:Shape" xmi:id="_YS8QUKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YS8QUasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YS8QU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YS8QUqsnEeqiJu55eR3W2w" x="280" y="-420"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YS8QUqsnEeqiJu55eR3W2w" x="280" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YTC-AKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YTC-AasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTC-A6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <children xmi:type="notation:Shape" xmi:id="_YTC-AKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YTC-AasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YTC-A6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YTC-AqsnEeqiJu55eR3W2w" x="280" y="-420"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YTC-AqsnEeqiJu55eR3W2w" x="280" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YTcmoKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YTcmoasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTcmo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <children xmi:type="notation:Shape" xmi:id="_YTcmoKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YTcmoasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YTcmo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YTcmoqsnEeqiJu55eR3W2w" x="1460" y="-320"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YTcmoqsnEeqiJu55eR3W2w" x="1460" y="-320"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_YU7NUKsnEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_YU7NUasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YU7NU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_YU7NUKsnEeqiJu55eR3W2w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_YU7NUasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YU7NU6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_YU7NUqsnEeqiJu55eR3W2w" x="1020" y="140"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YU7NUqsnEeqiJu55eR3W2w" x="1020" y="140"/>
     </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_l51YUer0EeaeHOJw3lCT8A" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_l51YUur0EeaeHOJw3lCT8A"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_Hz2UsIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_l51YUer0EeaeHOJw3lCT8A" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_l51YUur0EeaeHOJw3lCT8A"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Hz2UsIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_sI851-4REeaRONVEJOGI1g" type="StereotypeCommentLink" target="_sI850-4REeaRONVEJOGI1g">
-      <styles xsi:type="notation:FontStyle" xmi:id="_sI852O4REeaRONVEJOGI1g"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_sI853O4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_sI852e4REeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sI852u4REeaRONVEJOGI1g"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_sI852-4REeaRONVEJOGI1g"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_SXpJ8PItEea79czpMf3AVQ" type="StereotypeCommentLink" target="_SXpJ7PItEea79czpMf3AVQ">
-      <styles xsi:type="notation:FontStyle" xmi:id="_SXpJ8fItEea79czpMf3AVQ"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_SXpJ9fItEea79czpMf3AVQ" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_SXpJ8vItEea79czpMf3AVQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SXpJ8_ItEea79czpMf3AVQ"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_SXpJ9PItEea79czpMf3AVQ"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_6FhqkPLAEeaAIfPpmDwI5Q" type="StereotypeCommentLink" target="_6FhDgPLAEeaAIfPpmDwI5Q">
-      <styles xsi:type="notation:FontStyle" xmi:id="_6FhqkfLAEeaAIfPpmDwI5Q"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_6FhqlfLAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_6FhqkvLAEeaAIfPpmDwI5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6Fhqk_LAEeaAIfPpmDwI5Q"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_6FhqlPLAEeaAIfPpmDwI5Q"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_xaYCMIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_xaYpQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yVhwAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaYpQYuREeiu6boZkiJHCA" x="-40" y="79"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xaYpQouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yY-FkKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaYpQ4uREeiu6boZkiJHCA" x="-69" y="36"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xaYpRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ycsvAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaYpRYuREeiu6boZkiJHCA" x="36" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xaZQUIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ygXHAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaZQUYuREeiu6boZkiJHCA" x="-36" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xaZQUouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ykKo8KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaZQU4uREeiu6boZkiJHCA" x="24" y="-21"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_xaZQVIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yoXzgKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_xaZQVYuREeiu6boZkiJHCA" x="-23" y="-16"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_xaYCMYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_xaYCMouREeiu6boZkiJHCA" points="[320, -79, -643984, -643984]$[320, 200, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_yTgCkIuREeiu6boZkiJHCA" id="(0.5985037406483791,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_yyd2gIuREeiu6boZkiJHCA" id="(0.7368421052631579,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_zQcL8IuREeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_zQcL84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0vcgkIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczAIuREeiu6boZkiJHCA" x="1" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_zQczAYuREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0yAsYIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczAouREeiu6boZkiJHCA" x="-5" y="13"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_zQczA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0101YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczBIuREeiu6boZkiJHCA" x="-30" y="-56"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_zQczBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_057SQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczBouREeiu6boZkiJHCA" x="-50" y="-42"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_zQczB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_0-MHMIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczCIuREeiu6boZkiJHCA" x="14" y="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_zQczCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_1B-bAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_zQczCouREeiu6boZkiJHCA" x="-11" y="-13"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_zQcL8YuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_zQcL8ouREeiu6boZkiJHCA" points="[180, 200, -643984, -643984]$[180, 153, -643984, -643984]$[63, 153, -643984, -643984]$[63, 200, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0saasIuREeiu6boZkiJHCA" id="(0.5078947368421053,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0saasYuREeiu6boZkiJHCA" id="(0.0868421052631579,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_7buLUIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_7buyYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8bj3sIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyYYuREeiu6boZkiJHCA" x="-54" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_7buyYouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8eblgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyY4uREeiu6boZkiJHCA" x="-54" y="-14"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_7buyZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8g5qsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyZYuREeiu6boZkiJHCA" x="33" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_7buyZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8jbaQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyZ4uREeiu6boZkiJHCA" x="-32" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_7buyaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8nroIIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buyaYuREeiu6boZkiJHCA" x="17" y="19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_7buyaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_8rvBsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_7buya4uREeiu6boZkiJHCA" x="-10" y="-11"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_7buLUYuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_7buLUouREeiu6boZkiJHCA" points="[481, -213, -643984, -643984]$[767, -213, -643984, -643984]$[767, -140, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8Y1T0IuREeiu6boZkiJHCA" id="(1.0,0.43983402489626555)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8Y164IuREeiu6boZkiJHCA" id="(0.2754880694143167,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="__1Uo0IuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="__1VP4IuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_A-448IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP4YuREeiu6boZkiJHCA" x="-50" y="15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__1VP4ouREeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BBuxkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP44uREeiu6boZkiJHCA" x="-59" y="-15"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__1VP5IuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BEoUkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP5YuREeiu6boZkiJHCA" x="90" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__1VP5ouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BHMgYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__1VP54uREeiu6boZkiJHCA" x="-90" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__1VP6IuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BKIfoIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__1V28IuREeiu6boZkiJHCA" x="9" y="-12"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="__1V28YuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_BMoaAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="__1V28ouREeiu6boZkiJHCA" x="-24" y="-23"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="__1Uo0YuREeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="__1Uo0ouREeiu6boZkiJHCA" points="[481, -260, -643984, -643984]$[1260, -260, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_A6orEIuSEeiu6boZkiJHCA" id="(1.0,0.24896265560165975)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_A6orEYuSEeiu6boZkiJHCA" id="(0.0,0.18691588785046728)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_DVHJcIuSEeiu6boZkiJHCA" type="Association_Edge" source="__j6psOscEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwgIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FOZmUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwgYuSEeiu6boZkiJHCA" y="-19"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwgouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FSdm8IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwg4uSEeiu6boZkiJHCA" x="20" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwhIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FU_WgIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwhYuSEeiu6boZkiJHCA" x="34" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwhouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FXkJYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwh4uSEeiu6boZkiJHCA" x="-36" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DVHwiIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FaaCAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVHwiYuSEeiu6boZkiJHCA" x="22" y="-21"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_DVIXkIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_Fc7xkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_DVIXkYuSEeiu6boZkiJHCA" x="-8" y="22"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_DVHJcYuSEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_DVHJcouSEeiu6boZkiJHCA" points="[1260, -220, -643984, -643984]$[920, -220, -643984, -643984]$[920, -140, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FKfWsIuSEeiu6boZkiJHCA" id="(0.0,0.3115264797507788)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_FKfWsYuSEeiu6boZkiJHCA" id="(0.6073752711496746,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_J7u4IIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_J7u4I4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LGCvIIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7u4JIuSEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_J7u4JYuSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LIniAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7u4JouSEeiu6boZkiJHCA" x="12" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_J7u4J4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LLhFAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7u4KIuSEeiu6boZkiJHCA" x="57" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_J7vfMIuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LOAYUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7vfMYuSEeiu6boZkiJHCA" x="-58" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_J7vfMouSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LRP5kIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7vfM4uSEeiu6boZkiJHCA" x="14" y="29"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_J7vfNIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_LVWWcIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_J7vfNYuSEeiu6boZkiJHCA" x="-33" y="34"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_J7u4IYuSEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_J7u4IouSEeiu6boZkiJHCA" points="[1111, 481, -643984, -643984]$[1111, 323, -643984, -643984]$[1480, 323, -643984, -643984]$[1480, 1, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LChhEIuSEeiu6boZkiJHCA" id="(0.7771317829457365,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_LCiIIIuSEeiu6boZkiJHCA" id="(0.36605657237936773,1.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_NFTRIIuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_ryFlIOr0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_NFTRI4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OHDpEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4MIuSEeiu6boZkiJHCA" x="-4" y="11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4MYuSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OJi8YIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4MouSEeiu6boZkiJHCA" x="-61" y="-23"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4M4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OMbRQIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4NIuSEeiu6boZkiJHCA" x="34" y="-17"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4NYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OO6kkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4NouSEeiu6boZkiJHCA" x="-31" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4N4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_ORbtEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4OIuSEeiu6boZkiJHCA" x="14" y="16"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NFT4OYuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_OVqs0IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NFT4OouSEeiu6boZkiJHCA" x="-16" y="15"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_NFTRIYuSEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_NFTRIouSEeiu6boZkiJHCA" points="[322, 375, -643984, -643984]$[322, 461, -643984, -643984]$[619, 461, -643984, -643984]$[619, 601, -643984, -643984]$[706, 601, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OEQzwIuSEeiu6boZkiJHCA" id="(0.7421052631578947,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_OEQzwYuSEeiu6boZkiJHCA" id="(0.0,0.4979253112033195)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_S68O0IuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_rR8FcOr0EeaeHOJw3lCT8A" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_S6814IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xrdfUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S6814YuSEeiu6boZkiJHCA" x="8" y="-2"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S6814ouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xvY9EKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S68144uSEeiu6boZkiJHCA" x="-11"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S6815IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_xzTzwKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S6815YuSEeiu6boZkiJHCA" x="5" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S6815ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x3gXQKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S68154uSEeiu6boZkiJHCA" x="-5" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S6816IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_x7uI4KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S6816YuSEeiu6boZkiJHCA" x="25" y="24"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_S6816ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_yANnUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_S68164uSEeiu6boZkiJHCA" x="-21" y="26"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_S68O0YuSEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_S68O0ouSEeiu6boZkiJHCA" points="[170, 168, -643984, -643984]$[160, 255, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UaiZUIuSEeiu6boZkiJHCA" id="(0.21052631578947367,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_UvwbYIuSEeiu6boZkiJHCA" id="(0.19193857965451055,0.0)"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Wx-KwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v2L_wKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x0YuSEeiu6boZkiJHCA" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v6OLMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x04uSEeiu6boZkiJHCA" x="48" y="-84"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_v-UoEKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x1YuSEeiu6boZkiJHCA" x="24" y="-20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wCTwMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x14uSEeiu6boZkiJHCA" x="-24" y="20"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wGWisKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x2YuSEeiu6boZkiJHCA" x="20" y="-24"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Wx-x2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_wKSngKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Wx-x24uSEeiu6boZkiJHCA" x="-23" y="-26"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_Wx-KwYuSEeiu6boZkiJHCA"/>
-      <element href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Wx-KwouSEeiu6boZkiJHCA" points="[756, 481, -643984, -643984]$[756, 241, -643984, -643984]$[760, 241, -643984, -643984]$[760, 1, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_gnApcHJqEeq3NYg-TXSAxQ" id="(0.10465116279069768,0.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YzgksIuSEeiu6boZkiJHCA" id="(0.2603036876355748,1.0)"/>
+    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_sI851-4REeaRONVEJOGI1g" type="StereotypeCommentLink" target="_sI850-4REeaRONVEJOGI1g">
+      <styles xmi:type="notation:FontStyle" xmi:id="_sI852O4REeaRONVEJOGI1g"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sI853O4REeaRONVEJOGI1g" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sI852e4REeaRONVEJOGI1g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sI852u4REeaRONVEJOGI1g"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sI852-4REeaRONVEJOGI1g"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SXpJ8PItEea79czpMf3AVQ" type="StereotypeCommentLink" target="_SXpJ7PItEea79czpMf3AVQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_SXpJ8fItEea79czpMf3AVQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SXpJ9fItEea79czpMf3AVQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SXpJ8vItEea79czpMf3AVQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SXpJ8_ItEea79czpMf3AVQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SXpJ9PItEea79czpMf3AVQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6FhqkPLAEeaAIfPpmDwI5Q" type="StereotypeCommentLink" target="_6FhDgPLAEeaAIfPpmDwI5Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_6FhqkfLAEeaAIfPpmDwI5Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6FhqlfLAEeaAIfPpmDwI5Q" name="BASE_ELEMENT"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6FhqkvLAEeaAIfPpmDwI5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Fhqk_LAEeaAIfPpmDwI5Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6FhqlPLAEeaAIfPpmDwI5Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xaYCMIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xaYpQIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yVhwAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQYuREeiu6boZkiJHCA" x="-40" y="79"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xaYpQouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yY-FkKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpQ4uREeiu6boZkiJHCA" x="-69" y="36"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xaYpRIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ycsvAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaYpRYuREeiu6boZkiJHCA" x="36" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xaZQUIuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ygXHAKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQUYuREeiu6boZkiJHCA" x="-36" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xaZQUouREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ykKo8KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQU4uREeiu6boZkiJHCA" x="24" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xaZQVIuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yoXzgKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaZQVYuREeiu6boZkiJHCA" x="-23" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_xaYCMYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xaYCMouREeiu6boZkiJHCA" points="[320, -79, -643984, -643984]$[320, 200, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yTgCkIuREeiu6boZkiJHCA" id="(0.5985037406483791,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yyd2gIuREeiu6boZkiJHCA" id="(0.7368421052631579,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zQcL8IuREeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_s9Rl4Or0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zQcL84uREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0vcgkIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczAIuREeiu6boZkiJHCA" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zQczAYuREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0yAsYIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczAouREeiu6boZkiJHCA" x="-5" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zQczA4uREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0101YIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczBIuREeiu6boZkiJHCA" x="-30" y="-56"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zQczBYuREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_057SQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczBouREeiu6boZkiJHCA" x="-50" y="-42"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zQczB4uREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0-MHMIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczCIuREeiu6boZkiJHCA" x="14" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zQczCYuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1B-bAIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zQczCouREeiu6boZkiJHCA" x="-11" y="-13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_zQcL8YuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_wpXWgO38EeaRONVEJOGI1g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zQcL8ouREeiu6boZkiJHCA" points="[180, 200, -643984, -643984]$[180, 153, -643984, -643984]$[63, 153, -643984, -643984]$[63, 200, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0saasIuREeiu6boZkiJHCA" id="(0.5078947368421053,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0saasYuREeiu6boZkiJHCA" id="(0.0868421052631579,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7buLUIuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_7buyYIuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8bj3sIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyYYuREeiu6boZkiJHCA" x="-54" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7buyYouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8eblgIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyY4uREeiu6boZkiJHCA" x="-54" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7buyZIuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8g5qsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyZYuREeiu6boZkiJHCA" x="33" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7buyZouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8jbaQIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyZ4uREeiu6boZkiJHCA" x="-32" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7buyaIuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8nroIIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buyaYuREeiu6boZkiJHCA" x="17" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7buyaouREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8rvBsIuREeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7buya4uREeiu6boZkiJHCA" x="-10" y="-11"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_7buLUYuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7buLUouREeiu6boZkiJHCA" points="[481, -213, -643984, -643984]$[767, -213, -643984, -643984]$[767, -140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y1T0IuREeiu6boZkiJHCA" id="(1.0,0.43983402489626555)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Y164IuREeiu6boZkiJHCA" id="(0.2754880694143167,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__1Uo0IuREeiu6boZkiJHCA" type="Association_Edge" source="_W4xb0OsTEealN7CdLT_GPw" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__1VP4IuREeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A-448IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP4YuREeiu6boZkiJHCA" x="-50" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__1VP4ouREeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BBuxkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP44uREeiu6boZkiJHCA" x="-59" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__1VP5IuREeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BEoUkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP5YuREeiu6boZkiJHCA" x="90" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__1VP5ouREeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BHMgYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1VP54uREeiu6boZkiJHCA" x="-90" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__1VP6IuREeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BKIfoIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1V28IuREeiu6boZkiJHCA" x="9" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__1V28YuREeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BMoaAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__1V28ouREeiu6boZkiJHCA" x="-24" y="-23"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__1Uo0YuREeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__1Uo0ouREeiu6boZkiJHCA" points="[481, -260, -643984, -643984]$[1260, -260, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEIuSEeiu6boZkiJHCA" id="(1.0,0.24896265560165975)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6orEYuSEeiu6boZkiJHCA" id="(0.0,0.18691588785046728)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DVHJcIuSEeiu6boZkiJHCA" type="Association_Edge" source="__j6psOscEealN7CdLT_GPw" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwgIuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FOZmUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwgYuSEeiu6boZkiJHCA" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwgouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FSdm8IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwg4uSEeiu6boZkiJHCA" x="20" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwhIuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FU_WgIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwhYuSEeiu6boZkiJHCA" x="34" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwhouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FXkJYIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwh4uSEeiu6boZkiJHCA" x="-36" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DVHwiIuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FaaCAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVHwiYuSEeiu6boZkiJHCA" x="22" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DVIXkIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fc7xkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DVIXkYuSEeiu6boZkiJHCA" x="-8" y="22"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DVHJcYuSEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_p4w_sEUeEeWEwNCluy4jrw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DVHJcouSEeiu6boZkiJHCA" points="[1260, -220, -643984, -643984]$[920, -220, -643984, -643984]$[920, -140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsIuSEeiu6boZkiJHCA" id="(0.0,0.3115264797507788)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FKfWsYuSEeiu6boZkiJHCA" id="(0.6073752711496746,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J7u4IIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="__j6psOscEealN7CdLT_GPw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_J7u4I4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LGCvIIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JIuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_J7u4JYuSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LIniAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4JouSEeiu6boZkiJHCA" x="12" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_J7u4J4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LLhFAIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7u4KIuSEeiu6boZkiJHCA" x="57" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_J7vfMIuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LOAYUIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfMYuSEeiu6boZkiJHCA" x="-58" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_J7vfMouSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LRP5kIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfM4uSEeiu6boZkiJHCA" x="14" y="29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_J7vfNIuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LVWWcIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J7vfNYuSEeiu6boZkiJHCA" x="-33" y="34"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_J7u4IYuSEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_hSkgMOseEealN7CdLT_GPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7u4IouSEeiu6boZkiJHCA" points="[1111, 481, -643984, -643984]$[1111, 323, -643984, -643984]$[1480, 323, -643984, -643984]$[1480, 1, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LChhEIuSEeiu6boZkiJHCA" id="(0.7771317829457365,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCiIIIuSEeiu6boZkiJHCA" id="(0.36605657237936773,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NFTRIIuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_ryFlIOr0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_NFTRI4uSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OHDpEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MIuSEeiu6boZkiJHCA" x="-4" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4MYuSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OJi8YIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4MouSEeiu6boZkiJHCA" x="-61" y="-23"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4M4uSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OMbRQIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4NIuSEeiu6boZkiJHCA" x="34" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4NYuSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OO6kkIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4NouSEeiu6boZkiJHCA" x="-31" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4N4uSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ORbtEIuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4OIuSEeiu6boZkiJHCA" x="14" y="16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NFT4OYuSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OVqs0IuSEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NFT4OouSEeiu6boZkiJHCA" x="-16" y="15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_NFTRIYuSEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NFTRIouSEeiu6boZkiJHCA" points="[322, 375, -643984, -643984]$[322, 461, -643984, -643984]$[619, 461, -643984, -643984]$[619, 601, -643984, -643984]$[706, 601, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwIuSEeiu6boZkiJHCA" id="(0.7421052631578947,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQzwYuSEeiu6boZkiJHCA" id="(0.0,0.4979253112033195)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_S68O0IuSEeiu6boZkiJHCA" type="Association_Edge" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_rR8FcOr0EeaeHOJw3lCT8A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6814IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xrdfUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6814YuSEeiu6boZkiJHCA" x="8" y="-2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6814ouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xvY9EKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68144uSEeiu6boZkiJHCA" x="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6815IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xzTzwKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6815YuSEeiu6boZkiJHCA" x="5" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6815ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x3gXQKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68154uSEeiu6boZkiJHCA" x="-5" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6816IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x7uI4KZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6816YuSEeiu6boZkiJHCA" x="25" y="24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6816ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yANnUKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S68164uSEeiu6boZkiJHCA" x="-21" y="26"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_S68O0YuSEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S68O0ouSEeiu6boZkiJHCA" points="[170, 168, -643984, -643984]$[160, 255, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UaiZUIuSEeiu6boZkiJHCA" id="(0.21052631578947367,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UvwbYIuSEeiu6boZkiJHCA" id="(0.19193857965451055,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Wx-KwIuSEeiu6boZkiJHCA" type="Association_Edge" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_QjgYUOsSEealN7CdLT_GPw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x0IuSEeiu6boZkiJHCA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v2L_wKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x0YuSEeiu6boZkiJHCA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x0ouSEeiu6boZkiJHCA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v6OLMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x04uSEeiu6boZkiJHCA" x="48" y="-84"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x1IuSEeiu6boZkiJHCA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v-UoEKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x1YuSEeiu6boZkiJHCA" x="24" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x1ouSEeiu6boZkiJHCA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wCTwMKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x14uSEeiu6boZkiJHCA" x="-24" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x2IuSEeiu6boZkiJHCA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wGWisKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x2YuSEeiu6boZkiJHCA" x="20" y="-24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wx-x2ouSEeiu6boZkiJHCA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wKSngKZnEeqJcvXkREZ1XQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wx-x24uSEeiu6boZkiJHCA" x="-23" y="-26"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Wx-KwYuSEeiu6boZkiJHCA"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_KnJbUPIoEea79czpMf3AVQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wx-KwouSEeiu6boZkiJHCA" points="[756, 481, -643984, -643984]$[756, 241, -643984, -643984]$[760, 241, -643984, -643984]$[760, 1, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gnApcHJqEeq3NYg-TXSAxQ" id="(0.10465116279069768,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YzgksIuSEeiu6boZkiJHCA" id="(0.2603036876355748,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_qz57QHJqEeq3NYg-TXSAxQ" type="Association_Edge" source="_QjgYUOsSEealN7CdLT_GPw" target="_LmxJ0HJqEeq3NYg-TXSAxQ" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_qz57Q3JqEeq3NYg-TXSAxQ" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_S368IILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57RHJqEeq3NYg-TXSAxQ" x="15" y="-82"/>
+    <edges xmi:type="notation:Connector" xmi:id="_qz57QHJqEeq3NYg-TXSAxQ" type="Association_Edge" source="_QjgYUOsSEealN7CdLT_GPw" target="_LmxJ0HJqEeq3NYg-TXSAxQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qz57Q3JqEeq3NYg-TXSAxQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S368IILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RHJqEeq3NYg-TXSAxQ" x="15" y="-82"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_qz57RXJqEeq3NYg-TXSAxQ" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_S-s5kILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57RnJqEeq3NYg-TXSAxQ" x="-9" y="-108"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qz57RXJqEeq3NYg-TXSAxQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S-s5kILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57RnJqEeq3NYg-TXSAxQ" x="-9" y="-108"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_qz57R3JqEeq3NYg-TXSAxQ" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TFMjIILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57SHJqEeq3NYg-TXSAxQ" x="18" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qz57R3JqEeq3NYg-TXSAxQ" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TFMjIILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57SHJqEeq3NYg-TXSAxQ" x="18" y="-20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_qz57SXJqEeq3NYg-TXSAxQ" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TKM-8ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57SnJqEeq3NYg-TXSAxQ" x="-18" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qz57SXJqEeq3NYg-TXSAxQ" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TKM-8ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57SnJqEeq3NYg-TXSAxQ" x="-18" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_qz57S3JqEeq3NYg-TXSAxQ" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TOx88ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57THJqEeq3NYg-TXSAxQ" x="18" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qz57S3JqEeq3NYg-TXSAxQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TOx88ILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57THJqEeq3NYg-TXSAxQ" x="18" y="20"/>
       </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_qz57TXJqEeq3NYg-TXSAxQ" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_TT5tgILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_qz57TnJqEeq3NYg-TXSAxQ" x="-18" y="24"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qz57TXJqEeq3NYg-TXSAxQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TT5tgILlEeqLl4tIPv2RCg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qz57TnJqEeq3NYg-TXSAxQ" x="-18" y="24"/>
       </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_qz57QXJqEeq3NYg-TXSAxQ"/>
-      <element href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_qz57QnJqEeq3NYg-TXSAxQ" points="[980, -39, -643984, -643984]$[980, 140, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q6NXkHJqEeq3NYg-TXSAxQ" id="(0.737527114967462,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_q6NXkXJqEeq3NYg-TXSAxQ" id="(0.4199475065616798,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_qz57QXJqEeq3NYg-TXSAxQ"/>
+      <element xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qz57QnJqEeq3NYg-TXSAxQ" points="[980, -39, -643984, -643984]$[980, 140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkHJqEeq3NYg-TXSAxQ" id="(0.737527114967462,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q6NXkXJqEeq3NYg-TXSAxQ" id="(0.4199475065616798,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YMb_tKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_rR8FcOr0EeaeHOJw3lCT8A" target="_YMb_sKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YMb_tasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YMb_uasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YMb_tKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_rR8FcOr0EeaeHOJw3lCT8A" target="_YMb_sKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YMb_tasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YMb_uasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_MBqV4OrzEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YMb_tqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YMb_t6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YMb_uKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YMb_tqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YMb_t6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YMb_uKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YOTn9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_YOTn8KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YOTn9asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YOTn-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YOTn9KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ryFlIOr0EeaeHOJw3lCT8A" target="_YOTn8KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YOTn9asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YOTn-asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_jwuBoOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YOTn9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YOTn96snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YOTn-KsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YOTn9qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YOTn96snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YOTn-KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YPf6xKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_YPf6wKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YPf6xasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YPgh0qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YPf6xKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_s9Rl4Or0EeaeHOJw3lCT8A" target="_YPf6wKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YPf6xasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YPgh0qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_nuZ_MOryEeaeHOJw3lCT8A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YPf6xqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YPgh0KsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YPgh0asnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YPf6xqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YPgh0KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YPgh0asnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YQR94asnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_NFTRIIuSEeiu6boZkiJHCA" target="_YQRW0KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YQR94qsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQR95qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YQR94asnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_NFTRIIuSEeiu6boZkiJHCA" target="_YQRW0KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YQR94qsnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YQR95qsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#__LyaYOsYEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YQR946snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQR95KsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQR95asnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YQR946snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YQR95KsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YQR95asnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YQYrlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_S68O0IuSEeiu6boZkiJHCA" target="_YQYrkKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YQYrlasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQZSo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YQYrlKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_S68O0IuSEeiu6boZkiJHCA" target="_YQYrkKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YQYrlasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YQZSo6snEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_CpflcOsbEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YQZSoKsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQZSoasnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQZSoqsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YQZSoKsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YQZSoasnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YQZSoqsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YQwfAKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_QjgYUOsSEealN7CdLT_GPw" target="_YQv38KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YQwfAasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YQwfBasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YQwfAKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_QjgYUOsSEealN7CdLT_GPw" target="_YQv38KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YQwfAasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YQwfBasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_kkzTEEUbEeWKAbXi7_SowQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YQwfAqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQwfA6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YQwfBKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YQwfAqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YQwfA6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YQwfBKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YRYKFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_qz57QHJqEeq3NYg-TXSAxQ" target="_YRYKEKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YRYKFasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRYKGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YRYKFKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_qz57QHJqEeq3NYg-TXSAxQ" target="_YRYKEKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YRYKFasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YRYKGasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_qp-jMHJqEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YRYKFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRYKF6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRYKGKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YRYKFqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YRYKF6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YRYKGKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YRzA1KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_W4xb0OsTEealN7CdLT_GPw" target="_YRzA0KsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YRzA1asnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YRzA2asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YRzA1KsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_W4xb0OsTEealN7CdLT_GPw" target="_YRzA0KsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YRzA1asnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YRzA2asnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_IZ3vcEHbEeWqPKyD1j6LMg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YRzA1qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRzA16snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YRzA2KsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YRzA1qsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YRzA16snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YRzA2KsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YS07kasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xaYCMIuREeiu6boZkiJHCA" target="_YS0UgKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YS07kqsnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS07lqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YS07kasnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xaYCMIuREeiu6boZkiJHCA" target="_YS0UgKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YS07kqsnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YS07lqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_QZXS8OsUEealN7CdLT_GPw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YS07k6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS07lKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS07lasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YS07k6snEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YS07lKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YS07lasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YS8QVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7buLUIuREeiu6boZkiJHCA" target="_YS8QUKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YS8QVasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YS8QWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YS8QVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7buLUIuREeiu6boZkiJHCA" target="_YS8QUKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YS8QVasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YS8QWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ZiXD4EUcEeWEwNCluy4jrw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YS8QVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS8QV6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YS8QWKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YS8QVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YS8QV6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YS8QWKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YTC-BKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__1Uo0IuREeiu6boZkiJHCA" target="_YTC-AKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YTC-BasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTC-CasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YTC-BKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__1Uo0IuREeiu6boZkiJHCA" target="_YTC-AKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YTC-BasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YTC-CasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiConnectivity.uml#_ijcPoGkHEeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YTC-BqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTC-B6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTC-CKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YTC-BqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YTC-B6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YTC-CKsnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YTcmpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__j6psOscEealN7CdLT_GPw" target="_YTcmoKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YTcmpasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YTdNsqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YTcmpKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__j6psOscEealN7CdLT_GPw" target="_YTcmoKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YTcmpasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YTdNsqsnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YTcmpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTdNsKsnEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YTdNsasnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YTcmpqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YTdNsKsnEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YTdNsasnEeqiJu55eR3W2w"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_YU7NVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_LmxJ0HJqEeq3NYg-TXSAxQ" target="_YU7NUKsnEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_YU7NVasnEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_YU7NWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_YU7NVKsnEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_LmxJ0HJqEeq3NYg-TXSAxQ" target="_YU7NUKsnEeqiJu55eR3W2w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YU7NVasnEeqiJu55eR3W2w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_YU7NWasnEeqiJu55eR3W2w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiConnectivity.uml#__RAuEHJpEeq3NYg-TXSAxQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_YU7NVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YU7NV6snEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_YU7NWKsnEeqiJu55eR3W2w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YU7NVqsnEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YU7NV6snEeqiJu55eR3W2w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YU7NWKsnEeqiJu55eR3W2w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_W_wkgPItEea79czpMf3AVQ" type="PapyrusUMLClassDiagram" name="DataTypes" measurementUnit="Pixel">
-    <children xsi:type="notation:Shape" xmi:id="_X295UPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_X295UvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_X295U_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_X295VPItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_X295VfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_aeYngPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_1OME8L1xEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_aeYngfItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_aeYngvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_4mNJoL1xEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_aeYng_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_aeYnhPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_8UPhoL1xEeWdore3Cxez9g"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_aeYnhfItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_kpzWsGZtEeeB_84HvuxJBw" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_i55fUGZtEeeB_84HvuxJBw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_kpzWsWZtEeeB_84HvuxJBw"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_X295VvItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_X295V_ItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_X295WPItEea79czpMf3AVQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X295WfItEea79czpMf3AVQ"/>
-      </children>
-      <element href="TapiConnectivity.uml#_0-X6sLvZEeWYrqoqXLgguw"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_X295UfItEea79czpMf3AVQ" x="63" y="27"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_Y--DMPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_Y_EJ0PItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_Y_EJ0fItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_Y_EJ0vItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_Y_EJ0_ItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_bNDrYPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_yahuMurzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_bNDrYfItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_bNDrYvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_yahuNOrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_bNDrY_ItEea79czpMf3AVQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_Y_EJ1PItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_Y_EJ1fItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_Y_EJ1vItEea79czpMf3AVQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y_EJ1_ItEea79czpMf3AVQ"/>
-      </children>
-      <element href="TapiConnectivity.uml#_yahuMOrzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Y--DMfItEea79czpMf3AVQ" x="52" y="307"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ZQHdkPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZQHdkvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZQHdk_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZQHdlPItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ZQHdlfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_cEr28PItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_ya6ItOrzEeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEr28fItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_cEseAPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_NS_zMOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEseAfItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_cEseAvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_OesxUOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEseA_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_cEseBPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_P6rAEOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_cEseBfItEea79czpMf3AVQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ZQHdlvItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ZQHdl_ItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ZQHdmPItEea79czpMf3AVQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZQHdmfItEea79czpMf3AVQ"/>
-      </children>
-      <element href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZQHdkfItEea79czpMf3AVQ" x="53" y="171"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_ZgKEsPItEea79czpMf3AVQ" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZgKEsvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_ZgKEs_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_ZgKEtPItEea79czpMf3AVQ" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_ZgKEtfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_c3kscPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_6SvY4Or5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3kscfItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_c3kscvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_77pQYOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksc_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_c3ksdPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_9D5R4Or5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksdfItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_c3ksdvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_-84MwOr5EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksd_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_c3ksePItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_HeXssOr6EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksefItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_c3ksevItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_I_ObcOr6EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3kse_ItEea79czpMf3AVQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_c3ksfPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_KaoCcOr6EeaeHOJw3lCT8A"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_c3ksffItEea79czpMf3AVQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ZgKEtvItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_ZgKEt_ItEea79czpMf3AVQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_ZgKEuPItEea79czpMf3AVQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZgKEufItEea79czpMf3AVQ"/>
-      </children>
-      <element href="TapiConnectivity.uml#_ya6Iu-rzEeaeHOJw3lCT8A"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ZgKEsfItEea79czpMf3AVQ" x="181" y="171"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_CY6TQIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_CY99oIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_CY99oYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_CY99oohBEeeOl5P_FBJSmA" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_CY-ksIhBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_MQifsIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_QqOi4CmxEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQifsYhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_MQjGwIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_VVyKYCsiEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjGwYhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_MQjGwohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_SeYBECmxEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjGw4hBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_MQjt0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_UrO6MCmxEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjt0YhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_MQjt0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_2HxMYGrhEeezaeKmbo_0Qw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjt04hBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_MQjt1IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_3OZdQGrhEeezaeKmbo_0Qw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_MQjt1YhBEeeOl5P_FBJSmA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_CY-ksYhBEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_CY-ksohBEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_CY-ks4hBEeeOl5P_FBJSmA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CY-ktIhBEeeOl5P_FBJSmA"/>
-      </children>
-      <element href="TapiConnectivity.uml#_KtcbYCmxEeeA7tvtQmACtQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CY6TQYhBEeeOl5P_FBJSmA" x="348" y="211"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_IDDyoIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDEZsIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_IDEZsYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_IDEZsohBEeeOl5P_FBJSmA" y="5"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_IDEZs4hBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_I-b1wIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_t0InYCmoEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_I-b1wYhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_I-cc0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_N9G5gCmqEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_I-cc0YhBEeeOl5P_FBJSmA"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_I-cc0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
-          <element href="TapiConnectivity.uml#_Pr8Z4CmqEeeA7tvtQmACtQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_I-cc04hBEeeOl5P_FBJSmA"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_IDEZtIhBEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_IDEZtYhBEeeOl5P_FBJSmA"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_IDEZtohBEeeOl5P_FBJSmA"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IDEZt4hBEeeOl5P_FBJSmA"/>
-      </children>
-      <element href="TapiConnectivity.uml#__jPYUCmmEeeA7tvtQmACtQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IDDyoYhBEeeOl5P_FBJSmA" x="340" y="59"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_dzHqsHJYEeq3NYg-TXSAxQ" type="DataType_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_dzHqsnJYEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_dzHqs3JYEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_dzHqtHJYEeq3NYg-TXSAxQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_dzIRwHJYEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_ta7GAHJYEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiConnectivity.uml#_talHwHJYEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_ta7GAXJYEeq3NYg-TXSAxQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_PT_FQIWsEeqR8PjK46Cjgg" type="Property_DataTypeAttributeLabel">
-          <element href="TapiConnectivity.uml#_PTR6oIWsEeqR8PjK46Cjgg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_PT_FQYWsEeqR8PjK46Cjgg"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_dzIRwXJYEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_dzIRwnJYEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_dzIRw3JYEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dzIRxHJYEeq3NYg-TXSAxQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_dzIRxXJYEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_dzIRxnJYEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_dzIRx3JYEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_dzIRyHJYEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dzIRyXJYEeq3NYg-TXSAxQ"/>
-      </children>
-      <element href="TapiConnectivity.uml#_dzGckHJYEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dzHqsXJYEeq3NYg-TXSAxQ" x="580" y="240" width="261" height="101"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_NYE_IHJZEeq3NYg-TXSAxQ" type="DataType_Shape">
-      <children xsi:type="notation:DecorationNode" xmi:id="_NYE_InJZEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
-      <children xsi:type="notation:DecorationNode" xmi:id="_NYE_I3JZEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_NYE_JHJZEeq3NYg-TXSAxQ" y="15"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_NYE_JXJZEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
-        <children xsi:type="notation:Shape" xmi:id="_SXam8HJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiConnectivity.uml#_SWh2IHJZEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_SXam8XJZEeq3NYg-TXSAxQ"/>
-        </children>
-        <children xsi:type="notation:Shape" xmi:id="_sADOAHJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
-          <element href="TapiConnectivity.uml#_r_hCgHJZEeq3NYg-TXSAxQ"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_sADOAXJZEeq3NYg-TXSAxQ"/>
-        </children>
-        <styles xsi:type="notation:TitleStyle" xmi:id="_NYE_JnJZEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_NYE_J3JZEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_NYE_KHJZEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NYE_KXJZEeq3NYg-TXSAxQ"/>
-      </children>
-      <children xsi:type="notation:BasicCompartment" xmi:id="_NYFmMHJZEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_NYFmMXJZEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:SortingStyle" xmi:id="_NYFmMnJZEeq3NYg-TXSAxQ"/>
-        <styles xsi:type="notation:FilteringStyle" xmi:id="_NYFmM3JZEeq3NYg-TXSAxQ"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NYFmNHJZEeq3NYg-TXSAxQ"/>
-      </children>
-      <element href="TapiConnectivity.uml#_NYDxAHJZEeq3NYg-TXSAxQ"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NYE_IXJZEeq3NYg-TXSAxQ" x="580" y="60" width="381" height="81"/>
-    </children>
-    <styles xsi:type="notation:StringValueStyle" xmi:id="_W_wkgfItEea79czpMf3AVQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_W_wkgvItEea79czpMf3AVQ"/>
-    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_IK7_AIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <children xmi:type="notation:Shape" xmi:id="_X295UPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_X295UvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_X295U_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_X295VPItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_X295VfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_aeYngPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_1OME8L1xEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aeYngfItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aeYngvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_4mNJoL1xEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aeYng_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aeYnhPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_8UPhoL1xEeWdore3Cxez9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aeYnhfItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_kpzWsGZtEeeB_84HvuxJBw" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_i55fUGZtEeeB_84HvuxJBw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kpzWsWZtEeeB_84HvuxJBw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_X295VvItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_X295V_ItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_X295WPItEea79czpMf3AVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X295WfItEea79czpMf3AVQ"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_0-X6sLvZEeWYrqoqXLgguw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X295UfItEea79czpMf3AVQ" x="63" y="27"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Y--DMPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y_EJ0PItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y_EJ0fItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_EJ0vItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y_EJ0_ItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_bNDrYPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_yahuMurzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_bNDrYfItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_bNDrYvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_yahuNOrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_bNDrY_ItEea79czpMf3AVQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y_EJ1PItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y_EJ1fItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_EJ1vItEea79czpMf3AVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_EJ1_ItEea79czpMf3AVQ"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_yahuMOrzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y--DMfItEea79czpMf3AVQ" x="52" y="307"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZQHdkPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZQHdkvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZQHdk_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZQHdlPItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZQHdlfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_cEr28PItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_ya6ItOrzEeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEr28fItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_cEseAPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_NS_zMOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEseAfItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_cEseAvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_OesxUOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEseA_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_cEseBPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_P6rAEOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cEseBfItEea79czpMf3AVQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZQHdlvItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZQHdl_ItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZQHdmPItEea79czpMf3AVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZQHdmfItEea79czpMf3AVQ"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6IserzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZQHdkfItEea79czpMf3AVQ" x="53" y="171"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZgKEsPItEea79czpMf3AVQ" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZgKEsvItEea79czpMf3AVQ" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZgKEs_ItEea79czpMf3AVQ" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgKEtPItEea79czpMf3AVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZgKEtfItEea79czpMf3AVQ" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c3kscPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_6SvY4Or5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3kscfItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c3kscvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_77pQYOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksc_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c3ksdPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_9D5R4Or5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksdfItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c3ksdvItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_-84MwOr5EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksd_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c3ksePItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_HeXssOr6EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksefItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c3ksevItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_I_ObcOr6EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3kse_ItEea79czpMf3AVQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c3ksfPItEea79czpMf3AVQ" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_KaoCcOr6EeaeHOJw3lCT8A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c3ksffItEea79czpMf3AVQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZgKEtvItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZgKEt_ItEea79czpMf3AVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgKEuPItEea79czpMf3AVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgKEufItEea79czpMf3AVQ"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_ya6Iu-rzEeaeHOJw3lCT8A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgKEsfItEea79czpMf3AVQ" x="181" y="171"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CY6TQIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CY99oIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CY99oYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CY99oohBEeeOl5P_FBJSmA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CY-ksIhBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_MQifsIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_QqOi4CmxEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQifsYhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_MQjGwIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_VVyKYCsiEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjGwYhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_MQjGwohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_SeYBECmxEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjGw4hBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_MQjt0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_UrO6MCmxEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjt0YhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_MQjt0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_2HxMYGrhEeezaeKmbo_0Qw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjt04hBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_MQjt1IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_3OZdQGrhEeezaeKmbo_0Qw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MQjt1YhBEeeOl5P_FBJSmA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CY-ksYhBEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CY-ksohBEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CY-ks4hBEeeOl5P_FBJSmA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CY-ktIhBEeeOl5P_FBJSmA"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#_KtcbYCmxEeeA7tvtQmACtQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CY6TQYhBEeeOl5P_FBJSmA" x="348" y="211"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_IDDyoIhBEeeOl5P_FBJSmA" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDEZsIhBEeeOl5P_FBJSmA" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDEZsYhBEeeOl5P_FBJSmA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDEZsohBEeeOl5P_FBJSmA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IDEZs4hBEeeOl5P_FBJSmA" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_I-b1wIhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_t0InYCmoEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_I-b1wYhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_I-cc0IhBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_N9G5gCmqEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_I-cc0YhBEeeOl5P_FBJSmA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_I-cc0ohBEeeOl5P_FBJSmA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="TapiConnectivity.uml#_Pr8Z4CmqEeeA7tvtQmACtQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_I-cc04hBEeeOl5P_FBJSmA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IDEZtIhBEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IDEZtYhBEeeOl5P_FBJSmA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IDEZtohBEeeOl5P_FBJSmA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IDEZt4hBEeeOl5P_FBJSmA"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="TapiConnectivity.uml#__jPYUCmmEeeA7tvtQmACtQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IDDyoYhBEeeOl5P_FBJSmA" x="340" y="59"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dzHqsHJYEeq3NYg-TXSAxQ" type="DataType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dzHqsnJYEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dzHqs3JYEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dzHqtHJYEeq3NYg-TXSAxQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dzIRwHJYEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_ta7GAHJYEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_talHwHJYEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ta7GAXJYEeq3NYg-TXSAxQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_PT_FQIWsEeqR8PjK46Cjgg" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_PTR6oIWsEeqR8PjK46Cjgg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_PT_FQYWsEeqR8PjK46Cjgg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dzIRwXJYEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dzIRwnJYEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dzIRw3JYEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dzIRxHJYEeq3NYg-TXSAxQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dzIRxXJYEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dzIRxnJYEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dzIRx3JYEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dzIRyHJYEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dzIRyXJYEeq3NYg-TXSAxQ"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiConnectivity.uml#_dzGckHJYEeq3NYg-TXSAxQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dzHqsXJYEeq3NYg-TXSAxQ" x="580" y="240" width="261" height="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_NYE_IHJZEeq3NYg-TXSAxQ" type="DataType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_NYE_InJZEeq3NYg-TXSAxQ" type="DataType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NYE_I3JZEeq3NYg-TXSAxQ" type="DataType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NYE_JHJZEeq3NYg-TXSAxQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_NYE_JXJZEeq3NYg-TXSAxQ" type="DataType_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_SXam8HJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_SWh2IHJZEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_SXam8XJZEeq3NYg-TXSAxQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_sADOAHJZEeq3NYg-TXSAxQ" type="Property_DataTypeAttributeLabel">
+          <element xmi:type="uml:Property" href="TapiConnectivity.uml#_r_hCgHJZEeq3NYg-TXSAxQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_sADOAXJZEeq3NYg-TXSAxQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_NYE_JnJZEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_NYE_J3JZEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_NYE_KHJZEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYE_KXJZEeq3NYg-TXSAxQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_NYFmMHJZEeq3NYg-TXSAxQ" type="DataType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_NYFmMXJZEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_NYFmMnJZEeq3NYg-TXSAxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_NYFmM3JZEeq3NYg-TXSAxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYFmNHJZEeq3NYg-TXSAxQ"/>
+      </children>
+      <element xmi:type="uml:DataType" href="TapiConnectivity.uml#_NYDxAHJZEeq3NYg-TXSAxQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYE_IXJZEeq3NYg-TXSAxQ" x="580" y="60" width="381" height="81"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_W_wkgfItEea79czpMf3AVQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_W_wkgvItEea79czpMf3AVQ"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_IK7_AIuJEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
     </styles>
-    <element href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
-    <edges xsi:type="notation:Connector" xmi:id="_HWF0wHh-EeqVN_GB3rPx7g" type="Usage_Edge" source="_NYE_IHJZEeq3NYg-TXSAxQ" target="_dzHqsHJYEeq3NYg-TXSAxQ">
-      <children xsi:type="notation:DecorationNode" xmi:id="_HWGb0Hh-EeqVN_GB3rPx7g" type="Usage_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_H1BMcHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HWGb0Xh-EeqVN_GB3rPx7g" x="1" y="38"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_HWGb0nh-EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_H1hiwHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_HWGb03h-EeqVN_GB3rPx7g" x="1" y="57"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_HWF0wXh-EeqVN_GB3rPx7g"/>
-      <element href="TapiConnectivity.uml#_HWEmoHh-EeqVN_GB3rPx7g"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HWF0wnh-EeqVN_GB3rPx7g" points="[961, 160, -643984, -643984]$[841, 280, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HXJksHh-EeqVN_GB3rPx7g" id="(0.4199475065616798,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HXJksXh-EeqVN_GB3rPx7g" id="(0.6130268199233716,0.0)"/>
+    <element xmi:type="uml:Package" href="TapiConnectivity.uml#_TQ0awC5zEea0_JngOlSKcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_HWF0wHh-EeqVN_GB3rPx7g" type="Usage_Edge" source="_NYE_IHJZEeq3NYg-TXSAxQ" target="_dzHqsHJYEeq3NYg-TXSAxQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HWGb0Hh-EeqVN_GB3rPx7g" type="Usage_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H1BMcHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HWGb0Xh-EeqVN_GB3rPx7g" x="1" y="38"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HWGb0nh-EeqVN_GB3rPx7g" type="Usage_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H1hiwHh-EeqVN_GB3rPx7g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HWGb03h-EeqVN_GB3rPx7g" x="1" y="57"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HWF0wXh-EeqVN_GB3rPx7g"/>
+      <element xmi:type="uml:Usage" href="TapiConnectivity.uml#_HWEmoHh-EeqVN_GB3rPx7g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HWF0wnh-EeqVN_GB3rPx7g" points="[961, 160, -643984, -643984]$[841, 280, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HXJksHh-EeqVN_GB3rPx7g" id="(0.4199475065616798,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HXJksXh-EeqVN_GB3rPx7g" id="(0.6130268199233716,0.0)"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_oSV1sIDJEeqLl4tIPv2RCg">
-    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
-    <stylesheets xsi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAG9LEeqLWtFsc04LIg" path="/TAPI/UML/TapiClassDiagram.css"/>
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9sWmAW9LEeqLWtFsc04LIg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
   </css:ModelStyleSheets>
 </xmi:XMI>
diff --git a/UML/TapiPhotonicMedia.notation b/UML/TapiPhotonicMedia.notation
index 777fbe80..56ce8f28 100644
--- a/UML/TapiPhotonicMedia.notation
+++ b/UML/TapiPhotonicMedia.notation
@@ -601,133 +601,133 @@
       <element href="TapiCommon.uml#_ReBfoFs7EeexvMtO2oNM9g"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_CYa9IaGMEeqPrpdMOOTlbQ" x="1382" y="882"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HQyqMKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HQyqMatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HQzRQKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_biEm4LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_biEm4bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_biEm47CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HQyqMqtkEeqiJu55eR3W2w" x="580" y="40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_biEm4rCaEeq6S5EiV0C3pg" x="580" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HRP9MKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HRP9MatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRQkQKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_biuuMLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bivVQLCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bivVQrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HRP9MqtkEeqiJu55eR3W2w" x="480" y="440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bivVQbCaEeq6S5EiV0C3pg" x="480" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HRf00KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HRf00atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRf006tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bjKMALCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bjKMAbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bjKMA7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HRf00qtkEeqiJu55eR3W2w" x="680" y="440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bjKMArCaEeq6S5EiV0C3pg" x="680" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HRyIsKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HRyIsatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRyIs6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bjkbsLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bjkbsbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bjkbs7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HRyIsqtkEeqiJu55eR3W2w" x="1000" y="440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bjkbsrCaEeq6S5EiV0C3pg" x="1000" y="440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HSDOcKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HSDOcatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSDOc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bj7oELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bj7oEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bj8PILCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HSDOcqtkEeqiJu55eR3W2w" x="1160" y="240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bj7oErCaEeq6S5EiV0C3pg" x="1160" y="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HSZzwKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HSZzwatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSZzw6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bkmWcLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bkmWcbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bkmWc7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HSZzwqtkEeqiJu55eR3W2w" x="240" y="780"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bkmWcrCaEeq6S5EiV0C3pg" x="240" y="780"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HSmoEKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HSmoEatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSmoE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bk7GkLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bk7GkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bk7Gk7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HSmoEqtkEeqiJu55eR3W2w" x="1020" y="40"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bk7GkrCaEeq6S5EiV0C3pg" x="1020" y="40"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HTZ5UKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HTZ5UatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTZ5U6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bloRMLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bloRMbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bloRM7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HTZ5UqtkEeqiJu55eR3W2w" x="1420" y="420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bloRMrCaEeq6S5EiV0C3pg" x="1420" y="420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HTrmIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HTrmIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTrmI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bl-PcLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bl-PcbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bl-Pc7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HTrmIqtkEeqiJu55eR3W2w" x="720" y="740"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bl-PcrCaEeq6S5EiV0C3pg" x="720" y="740"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HT5okKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HT5okatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HT5ok6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bmSYgLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bmSYgbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bmSYg7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HT5okqtkEeqiJu55eR3W2w" x="252" y="34"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bmSYgrCaEeq6S5EiV0C3pg" x="252" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HUISEKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HUISEatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUISE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bmoWwLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bmoWwbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bmoWw7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUISEqtkEeqiJu55eR3W2w" x="240" y="280"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bmoWwrCaEeq6S5EiV0C3pg" x="240" y="280"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HUcbIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HUcbIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUcbI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bnOMoLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bnOMobCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bnOMo7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUcbIqtkEeqiJu55eR3W2w" x="240" y="180"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bnOMorCaEeq6S5EiV0C3pg" x="240" y="180"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HUnaQKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HUnaQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUnaQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bnnOMLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bnnOMbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bnnOM7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HUnaQqtkEeqiJu55eR3W2w" x="880" y="720"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bnnOMrCaEeq6S5EiV0C3pg" x="880" y="720"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HU1csKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HU1csatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HU1cs6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bn_BoLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bn_BobCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bn_Bo7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HU1csqtkEeqiJu55eR3W2w" x="1260" y="823"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bn_BorCaEeq6S5EiV0C3pg" x="1260" y="823"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HVDfIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HVDfIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVDfI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_boYqQLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_boYqQbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_boZRULCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HVDfIqtkEeqiJu55eR3W2w" x="520" y="240"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_boYqQrCaEeq6S5EiV0C3pg" x="520" y="240"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HVb5oKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HVb5oatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVb5o6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_bpCKgLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_bpCKgbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bpCKg7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HVb5oqtkEeqiJu55eR3W2w" x="920" y="940"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_bpCKgrCaEeq6S5EiV0C3pg" x="920" y="940"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_w3tFAY6QEeeyZasfnNSonw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_w3tFAo6QEeeyZasfnNSonw"/>
@@ -758,165 +758,165 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMIoJEeivCevppATXng" id="(0.5741626794258373,0.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Li9KMYoJEeivCevppATXng" id="(0.5242718446601942,1.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HQzRQatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xnJk8I6QEeeyZasfnNSonw" target="_HQyqMKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HQzRQqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HQzRRqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_biEm5LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xnJk8I6QEeeyZasfnNSonw" target="_biEm4LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_biEm5bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_biFN8bCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3xBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HQzRQ6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HQzRRKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HQzRRatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_biEm5rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_biEm57CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_biFN8LCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HRQkQatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BsudMI6YEeeyZasfnNSonw" target="_HRP9MKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HRQkQqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRQkRqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bivVQ7CaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_BsudMI6YEeeyZasfnNSonw" target="_biuuMLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bivVRLCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bivVSLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_iHIbYI6KEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HRQkQ6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRQkRKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRQkRatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bivVRbCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bivVRrCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bivVR7CaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HRf01KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_GaDH8I6YEeeyZasfnNSonw" target="_HRf00KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HRf01atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRf02atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bjKMBLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_GaDH8I6YEeeyZasfnNSonw" target="_bjKMALCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bjKMBbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bjKMCbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_htJmYI6QEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HRf01qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRf016tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRf02KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bjKMBrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bjKMB7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bjKMCLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HRyItKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_I9O2YI6YEeeyZasfnNSonw" target="_HRyIsKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HRyItatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HRyIuatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bjkbtLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_I9O2YI6YEeeyZasfnNSonw" target="_bjkbsLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bjkbtbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bjkbubCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_E7uYgI6HEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HRyItqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRyIt6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HRyIuKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bjkbtrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bjkbt7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bjkbuLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HSDOdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Lm61cI6YEeeyZasfnNSonw" target="_HSDOcKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HSDOdatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSD1gqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bj8PIbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_Lm61cI6YEeeyZasfnNSonw" target="_bj7oELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bj8PIrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bj8PJrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3vRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HSDOdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSD1gKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSD1gatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bj8PI7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bj8PJLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bj8PJbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HSZzxKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xu7CoI8ZEeedErNofqJXiw" target="_HSZzwKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HSZzxatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSZzyatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bkmWdLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xu7CoI8ZEeedErNofqJXiw" target="_bkmWcLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bkmWdbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bkm9grCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ujOyoC_2EeeAJ6VQzZ2ulw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HSZzxqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSZzx6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSZzyKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bkmWdrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bkm9gLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bkm9gbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HSmoFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_wB7jIXPYEeiPPoPDo3q5jA" target="_HSmoEKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HSmoFatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HSmoGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bk7GlLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_wB7jIXPYEeiPPoPDo3q5jA" target="_bk7GkLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bk7GlbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bk7toLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wB7jIHPYEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HSmoFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSmoF6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HSmoGKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bk7GlrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bk7Gl7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bk7GmLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HTZ5VKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="__ZU_8XkzEeiO-c_khjKlFQ" target="_HTZ5UKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HTZ5VatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTZ5WatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bloRNLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="__ZU_8XkzEeiO-c_khjKlFQ" target="_bloRMLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bloRNbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bloRObCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#__ZU_8HkzEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HTZ5VqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTZ5V6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTZ5WKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bloRNrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bloRN7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bloROLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HTrmJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_3YLeMHpKEei5LIrjJTgegQ" target="_HTrmIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HTrmJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HTrmKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bl-PdLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_3YLeMHpKEei5LIrjJTgegQ" target="_bl-PcLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bl-PdbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bl-PebCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_01yZ8HpKEei5LIrjJTgegQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HTrmJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTrmJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HTrmKKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bl-PdrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bl-Pd7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bl-PeLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HT5olKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_DY-LUIoJEeivCevppATXng" target="_HT5okKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HT5olatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HT5omatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bmSYhLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_DY-LUIoJEeivCevppATXng" target="_bmSYgLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bmSYhbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bmSYibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_-eq88Ik2Eeil5oKL3Vgl-g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HT5olqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HT5ol6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HT5omKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bmSYhrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bmSYh7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bmSYiLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HUISFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Er39oIoJEeivCevppATXng" target="_HUISEKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HUISFatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUISGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bmoWxLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_Er39oIoJEeivCevppATXng" target="_bmoWwLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bmoWxbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bmoWybCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ErlpwIoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HUISFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUISF6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUISGKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bmoWxrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bmoWx7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bmoWyLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HUcbJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_LhPS8YoJEeivCevppATXng" target="_HUcbIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HUcbJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUcbKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bnOzsLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_LhPS8YoJEeivCevppATXng" target="_bnOMoLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bnOzsbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bnOztbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_LhPS8IoJEeivCevppATXng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HUcbJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUcbJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUcbKKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bnOzsrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnOzs7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnOztLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HUnaRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EMsiYLqdEeimKvjOEffRIA" target="_HUnaQKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HUnaRatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HUnaSatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bnnONLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_EMsiYLqdEeimKvjOEffRIA" target="_bnnOMLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bnnONbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bnnOObCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_4qTT8LKeEei69qzpcujF2A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HUnaRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUnaR6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HUnaSKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bnnONrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnnON7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bnnOOLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HU1ctKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lnxLALqdEeimKvjOEffRIA" target="_HU1csKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HU1ctatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HU1cuatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bn_BpLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_lnxLALqdEeimKvjOEffRIA" target="_bn_BoLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bn_BpbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bn_osLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_lnk9wLqdEeimKvjOEffRIA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HU1ctqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HU1ct6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HU1cuKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bn_BprCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bn_Bp7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bn_BqLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HVDfJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_nCyqQMG-EeiAg83ctgK3eQ" target="_HVDfIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HVDfJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVDfKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_boZRUbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_nCyqQMG-EeiAg83ctgK3eQ" target="_boYqQLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_boZRUrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_boZRVrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nCmdAMG-EeiAg83ctgK3eQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HVDfJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVDfJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVDfKKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_boZRU7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_boZRVLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_boZRVbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HVb5pKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_KXjRAG9yEeqLWtFsc04LIg" target="_HVb5oKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HVb5patkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HVb5qatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_bpCxkLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_KXjRAG9yEeqLWtFsc04LIg" target="_bpCKgLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_bpCxkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_bpCxlbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_05Y7wG9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HVb5pqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVb5p6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HVb5qKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_bpCxkrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bpCxk7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_bpCxlLCaEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_gKM6AI6dEeeyZasfnNSonw" type="layersTree" name="Layers Tree Editor"/>
@@ -1022,13 +1022,13 @@
         </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4rH_DHjAEeixydPRZ8lIKA" x="-259" y="-447" width="159" height="62"/>
       </children>
-      <children xsi:type="notation:Shape" xmi:id="_ICksc6tkEeqiJu55eR3W2w" type="StereotypeComment">
-        <styles xsi:type="notation:TitleStyle" xmi:id="_ICksdKtkEeqiJu55eR3W2w"/>
-        <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICksdqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+      <children xsi:type="notation:Shape" xmi:id="_c1DRsLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_c1DRsbCaEeq6S5EiV0C3pg"/>
+        <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c1Ef0LCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
           <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
         </styles>
         <element xsi:nil="true"/>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ICksdatkEeqiJu55eR3W2w" x="-59" y="-447"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c1DRsrCaEeq6S5EiV0C3pg" x="-59" y="-447"/>
       </children>
       <element href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-8QyEXiGEeiPPoPDo3q5jA" x="-280" y="-456" width="721" height="62"/>
@@ -1073,10 +1073,6 @@
           <element href="TapiPhotonicMedia.uml#_x9XaUJJmEee26o4qs2D5Ig"/>
           <layoutConstraint xsi:type="notation:Location" xmi:id="_UKIvUXZpEeiPPoPDo3q5jA"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_UKIvUnZpEeiPPoPDo3q5jA" type="Property_ClassAttributeLabel">
-          <element href="TapiPhotonicMedia.uml#_t2oxcI50EeeyZasfnNSonw"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_UKIvU3ZpEeiPPoPDo3q5jA"/>
-        </children>
         <children xsi:type="notation:Shape" xmi:id="_UKIvVHZpEeiPPoPDo3q5jA" type="Property_ClassAttributeLabel">
           <element href="TapiPhotonicMedia.uml#_7gkK0I50EeeyZasfnNSonw"/>
           <layoutConstraint xsi:type="notation:Location" xmi:id="_UKIvVXZpEeiPPoPDo3q5jA"/>
@@ -1340,10 +1336,6 @@
           <element href="TapiPhotonicMedia.uml#_nWzrw5mYEeiOmuqNbykpsw"/>
           <layoutConstraint xsi:type="notation:Location" xmi:id="_zAoOkZmYEeiOmuqNbykpsw"/>
         </children>
-        <children xsi:type="notation:Shape" xmi:id="_R31AIKE5EeqPrpdMOOTlbQ" type="Property_ClassAttributeLabel">
-          <element href="TapiPhotonicMedia.uml#_1vzJ4G9xEeqLWtFsc04LIg"/>
-          <layoutConstraint xsi:type="notation:Location" xmi:id="_R31AIaE5EeqPrpdMOOTlbQ"/>
-        </children>
         <styles xsi:type="notation:TitleStyle" xmi:id="_EtIM5pmWEeiOmuqNbykpsw"/>
         <styles xsi:type="notation:SortingStyle" xmi:id="_EtIM55mWEeiOmuqNbykpsw"/>
         <styles xsi:type="notation:FilteringStyle" xmi:id="_EtIM6JmWEeiOmuqNbykpsw"/>
@@ -1658,277 +1650,269 @@
       <element href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_pqbkkaE3EeqPrpdMOOTlbQ" x="1233" y="-287" height="116"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ICWqAKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ICWqAatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICWqA6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c0t6gLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c0t6gbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c0t6g7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ICWqAqtkEeqiJu55eR3W2w" x="-80" y="-456"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c0t6grCaEeq6S5EiV0C3pg" x="-80" y="-456"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IDX9sKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IDX9satkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IDX9s6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c2ElYLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c2ElYbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c2ElY7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IDX9sqtkEeqiJu55eR3W2w" x="-96" y="-306"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c2ElYrCaEeq6S5EiV0C3pg" x="-96" y="-306"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ID6wQKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ID6wQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ID7XUKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c2y-ILCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c2y-IbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c2y-I7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ID6wQqtkEeqiJu55eR3W2w" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c2y-IrCaEeq6S5EiV0C3pg" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IEBd8KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IEBd8atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEBd86tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c26S4LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c26S4bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c2658LCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEBd8qtkEeqiJu55eR3W2w" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c26S4rCaEeq6S5EiV0C3pg" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IEKA0KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IEKA0atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEKA06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c3Dc0LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c3Dc0bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c3Dc07CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEKA0qtkEeqiJu55eR3W2w" x="-96" y="-406"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c3Dc0rCaEeq6S5EiV0C3pg" x="-96" y="-406"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IEuokKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IEuokatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEuok6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c3zqwLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c3zqwbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c3zqw7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IEuokqtkEeqiJu55eR3W2w" x="-100" y="297"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c3zqwrCaEeq6S5EiV0C3pg" x="-100" y="297"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IFk9IKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IFk9IatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IFk9I6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c4528LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c4528bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c45287CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IFk9IqtkEeqiJu55eR3W2w" x="-100" y="197"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c4528rCaEeq6S5EiV0C3pg" x="-100" y="197"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IGEFUKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IGEFUatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IGEFU6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c5gT4LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c5gT4bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c5g68LCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IGEFUqtkEeqiJu55eR3W2w" x="908" y="-460"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c5gT4rCaEeq6S5EiV0C3pg" x="908" y="-460"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IHPKAKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IHPKAatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IHPKA6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c7ROcLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c7ROcbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c7ROc7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IHPKAqtkEeqiJu55eR3W2w" x="708" y="-171"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c7ROcrCaEeq6S5EiV0C3pg" x="708" y="-171"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IH7tkKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IH7tkatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IH8UoKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c8XaoLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c8XaobCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c8Xao7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IH7tkqtkEeqiJu55eR3W2w" x="708" y="-271"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c8XaorCaEeq6S5EiV0C3pg" x="708" y="-271"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IICbQKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IICbQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IICbQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c8f9gLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c8f9gbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c8f9g7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IICbQqtkEeqiJu55eR3W2w" x="708" y="-271"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c8f9grCaEeq6S5EiV0C3pg" x="708" y="-271"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IIlN0KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IIlN0atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IIlN06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c9ZVYLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c9ZVYbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c9Z8cLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IIlN0qtkEeqiJu55eR3W2w" x="309" y="115"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c9ZVYrCaEeq6S5EiV0C3pg" x="309" y="115"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IJmhgKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IJmhgatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IJmhg6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_c_3akLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_c_3akbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c_3ak7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IJmhgqtkEeqiJu55eR3W2w" x="709" y="34"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_c_3akrCaEeq6S5EiV0C3pg" x="709" y="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IKrfkKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IKrfkatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IKsGoKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dCOyELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dCOyEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dCOyE7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IKrfkqtkEeqiJu55eR3W2w" x="709" y="-66"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dCOyErCaEeq6S5EiV0C3pg" x="709" y="-66"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ILRVcKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ILRVcatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILRVc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dDTwILCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dDTwIbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dDTwI7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ILRVcqtkEeqiJu55eR3W2w" x="260" y="-300"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dDTwIrCaEeq6S5EiV0C3pg" x="260" y="-300"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ILwdoKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ILwdoatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILwdo6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dEHocLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dEHocbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dEHoc7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ILwdoqtkEeqiJu55eR3W2w" x="260" y="-400"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dEHocrCaEeq6S5EiV0C3pg" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IL5nkKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IL5nkatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IL5nk6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dESAgLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dESAgbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dESAg7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IL5nkqtkEeqiJu55eR3W2w" x="260" y="-400"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dESAgrCaEeq6S5EiV0C3pg" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IMAVQKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IMAVQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IMAVQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dEajYLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dEbKcLCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dEbKcrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IMAVQqtkEeqiJu55eR3W2w" x="260" y="-400"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dEbKcbCaEeq6S5EiV0C3pg" x="260" y="-400"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IM2CwKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IM2CwatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IM2p0atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dF1fsLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dF1fsbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dF2GwbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IM2p0KtkEeqiJu55eR3W2w" x="1288" y="-129"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dF2GwLCaEeq6S5EiV0C3pg" x="1288" y="-129"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_INs-YKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_INs-YatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_INs-Y6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dHHSELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dHHSEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dHH5ILCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_INs-YqtkEeqiJu55eR3W2w" x="1288" y="-229"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dHHSErCaEeq6S5EiV0C3pg" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IN0TIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IN0TIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN0TI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dHS4QLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dHS4QbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dHS4Q7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IN0TIqtkEeqiJu55eR3W2w" x="1288" y="-229"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_IN7n4KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IN7n4atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN8O8KtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IN7n4qtkEeqiJu55eR3W2w" x="1288" y="-229"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dHS4QrCaEeq6S5EiV0C3pg" x="1288" y="-229"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IOir4KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IOir4atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IOir46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dIZEcLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dIZEcbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dIZrgLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IOir4qtkEeqiJu55eR3W2w" x="1563" y="103"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dIZEcrCaEeq6S5EiV0C3pg" x="1337" y="120"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IPDpQKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IPDpQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPDpQ6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dJqPwLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dJqPwbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dJq20LCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IPDpQqtkEeqiJu55eR3W2w" x="1563" y="3"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dJqPwrCaEeq6S5EiV0C3pg" x="1337" y="20"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IPo4EKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IPo4EatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPo4E6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dKeIELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dKeIEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dKeIE7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IPo4EqtkEeqiJu55eR3W2w" x="706" y="402"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dKeIErCaEeq6S5EiV0C3pg" x="709" y="459"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IQvEQKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IQvEQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IQvrUKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dL0y8LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dL0y8bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dL1aALCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IQvEQqtkEeqiJu55eR3W2w" x="-101" y="601"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dL0y8rCaEeq6S5EiV0C3pg" x="-101" y="601"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ISJZgKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ISJZgatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ISJZg6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dNdKoLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dNdKobCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dNdKo7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ISJZgqtkEeqiJu55eR3W2w" x="1360" y="439"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dNdKorCaEeq6S5EiV0C3pg" x="1265" y="442"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IS944KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IS944atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IS9446tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dOvkELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dOvkEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dOvkE7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IS944qtkEeqiJu55eR3W2w" x="20" y="-77"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dOvkErCaEeq6S5EiV0C3pg" x="20" y="-77"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_ITwjEKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_ITwjEatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ITwjE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dQB9gLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dQB9gbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dQB9g7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ITwjEqtkEeqiJu55eR3W2w" x="960" y="-282"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dQB9grCaEeq6S5EiV0C3pg" x="960" y="-282"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IUJkoKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IUJkoatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUJko6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dQuhELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dQuhEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dQuhE7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IUJkoqtkEeqiJu55eR3W2w" x="960" y="-382"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dQuhErCaEeq6S5EiV0C3pg" x="960" y="-382"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IUQ5YKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IUQ5YatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUQ5Y6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dQ45ILCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dQ45IbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dQ45I7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IUQ5YqtkEeqiJu55eR3W2w" x="960" y="-382"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dQ45IrCaEeq6S5EiV0C3pg" x="960" y="-382"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IUqiAKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IUqiAatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUqiA6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dRhyULCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dRhyUbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dRhyU7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IUqiAqtkEeqiJu55eR3W2w" x="1433" y="-287"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dRhyUrCaEeq6S5EiV0C3pg" x="1433" y="-287"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IVHN8KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IVHN8atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVH1AKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dSVDkLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dSVDkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dSVDk7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IVHN8qtkEeqiJu55eR3W2w" x="1433" y="-387"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dSVDkrCaEeq6S5EiV0C3pg" x="1433" y="-387"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_IVNUkKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_IVNUkatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVN7oKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_dSdmcLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_dSdmcbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dSdmc7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_IVNUkqtkEeqiJu55eR3W2w" x="1433" y="-387"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dSdmcrCaEeq6S5EiV0C3pg" x="1433" y="-387"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_z6FlAY6dEeeyZasfnNSonw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_z6FlAo6dEeeyZasfnNSonw"/>
@@ -2213,37 +2197,6 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_NeU44G9rEeqLWtFsc04LIg" id="(0.0,0.5970149253731343)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_07ESQMMqEei3gLXE4_XcoA" id="(1.0,0.5806451612903226)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_1zohAG9xEeqLWtFsc04LIg" type="Association_Edge" source="_EtIM4JmWEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg" routing="Rectilinear">
-      <children xsi:type="notation:DecorationNode" xmi:id="_1zpIEG9xEeqLWtFsc04LIg" type="Association_StereotypeLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2GwX0KE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIEW9xEeqLWtFsc04LIg" x="155" y="-87"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_1zpIEm9xEeqLWtFsc04LIg" type="Association_NameLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2NFCQKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIE29xEeqLWtFsc04LIg" x="125" y="-57"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_1zpIFG9xEeqLWtFsc04LIg" type="Association_TargetRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2UFCIKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpIFW9xEeqLWtFsc04LIg" x="54" y="-18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_1zpvIG9xEeqLWtFsc04LIg" type="Association_SourceRoleLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2cJZAKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvIW9xEeqLWtFsc04LIg" x="-55" y="18"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_1zpvIm9xEeqLWtFsc04LIg" type="Association_SourceMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2knYgKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvI29xEeqLWtFsc04LIg" x="23" y="22"/>
-      </children>
-      <children xsi:type="notation:DecorationNode" xmi:id="_1zpvJG9xEeqLWtFsc04LIg" type="Association_TargetMultiplicityLabel">
-        <styles xsi:type="notation:BooleanValueStyle" xmi:id="_2rnYYKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1zpvJW9xEeqLWtFsc04LIg" x="-23" y="25"/>
-      </children>
-      <styles xsi:type="notation:FontStyle" xmi:id="_1zohAW9xEeqLWtFsc04LIg"/>
-      <element href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1zohAm9xEeqLWtFsc04LIg" points="[1101, -4, -643984, -643984]$[1101, 442, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYG9xEeqLWtFsc04LIg" id="(0.027675276752767528,1.0)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_18FSYW9xEeqLWtFsc04LIg" id="(0.07480314960629922,0.0)"/>
-    </edges>
     <edges xsi:type="notation:Connector" xmi:id="_7O7aIG9zEeqLWtFsc04LIg" type="Association_Edge" source="_s3mNEJmTEeiOmuqNbykpsw" target="_YH1UkG9zEeqLWtFsc04LIg" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_7O8BMG9zEeqLWtFsc04LIg" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-A2gkKE2EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2364,17 +2317,17 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_z-f_8aE4EeqPrpdMOOTlbQ"/>
       <element href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_z-f_8qE4EeqPrpdMOOTlbQ" points="[1374, -287, -643984, -643984]$[1374, -393, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0IKSQKE4EeqPrpdMOOTlbQ" id="(0.3389423076923077,0.0)"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0IKSQKE4EeqPrpdMOOTlbQ" id="(0.3863013698630137,0.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_0IK5UKE4EeqPrpdMOOTlbQ" id="(0.961038961038961,1.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_1ei2YKE4EeqPrpdMOOTlbQ" type="Association_Edge" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_aw4GAJmYEeiOmuqNbykpsw" routing="Rectilinear">
       <children xsi:type="notation:DecorationNode" xmi:id="_1ei2Y6E4EeqPrpdMOOTlbQ" type="Association_StereotypeLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WNh1EKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ei2ZKE4EeqPrpdMOOTlbQ" x="90" y="75"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ei2ZKE4EeqPrpdMOOTlbQ" x="65" y="-87"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1ei2ZaE4EeqPrpdMOOTlbQ" type="Association_NameLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WS7ScKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ei2ZqE4EeqPrpdMOOTlbQ" x="67" y="75"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_1ei2ZqE4EeqPrpdMOOTlbQ" x="33" y="-108"/>
       </children>
       <children xsi:type="notation:DecorationNode" xmi:id="_1ei2Z6E4EeqPrpdMOOTlbQ" type="Association_TargetRoleLabel">
         <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WX7HMKE5EeqPrpdMOOTlbQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2394,8 +2347,8 @@
       </children>
       <styles xsi:type="notation:FontStyle" xmi:id="_1ei2YaE4EeqPrpdMOOTlbQ"/>
       <element href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1ei2YqE4EeqPrpdMOOTlbQ" points="[1642, -171, -643984, -643984]$[1642, 120, -643984, -643984]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEKE4EeqPrpdMOOTlbQ" id="(0.9783653846153846,1.0)"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_1ei2YqE4EeqPrpdMOOTlbQ" points="[1598, -229, -643984, -643984]$[1638, -229, -643984, -643984]$[1638, 120, -643984, -643984]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEKE4EeqPrpdMOOTlbQ" id="(1.0,0.5)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_1npvEaE4EeqPrpdMOOTlbQ" id="(0.8824561403508772,0.0)"/>
     </edges>
     <edges xsi:type="notation:Connector" xmi:id="_kK61oKE8EeqPrpdMOOTlbQ" type="Association_Edge" source="_aw4GAJmYEeiOmuqNbykpsw" target="_hZNgsG9wEeqLWtFsc04LIg" routing="Rectilinear">
@@ -2460,355 +2413,345 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_KmorAKGoEeqPrpdMOOTlbQ" id="(1.0,0.1791044776119403)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_KmorAaGoEeqPrpdMOOTlbQ" id="(1.0,0.7910447761194029)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ICWqBKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_-8QyEHiGEeiPPoPDo3q5jA" target="_ICWqAKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ICWqBatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICXREqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c0t6hLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_-8QyEHiGEeiPPoPDo3q5jA" target="_c0t6gLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c0t6hbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c0t6ibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ICWqBqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICXREKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICXREatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c0t6hrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c0t6h7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c0t6iLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ICksd6tkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_4rH-0HjAEeixydPRZ8lIKA" target="_ICksc6tkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ICkseKtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ICksfKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c1Ef0bCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_4rH-0HjAEeixydPRZ8lIKA" target="_c1DRsLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c1Ef0rCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c1FG4LCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ICkseatkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICkseqtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ICkse6tkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c1Ef07CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c1Ef1LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c1Ef1bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IDX9tKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_IDX9sKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IDX9tatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IDX9uatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c2ElZLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_EqrGYHiHEeiPPoPDo3q5jA" target="_c2ElYLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c2ElZbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c2ElabCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_EqncAHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IDX9tqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IDX9t6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IDX9uKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c2ElZrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c2ElZ7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c2ElaLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ID7XUatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Y9rskHiHEeiPPoPDo3q5jA" target="_ID6wQKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ID7XUqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ID7XVqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c2y-JLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_Y9rskHiHEeiPPoPDo3q5jA" target="_c2y-ILCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c2y-JbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c2y-KbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y9qecHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ID7XU6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ID7XVKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ID7XVatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c2y-JrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c2y-J7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c2y-KLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IEBd9KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7cWEIIuWEeiu6boZkiJHCA" target="_IEBd8KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IEBd9atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IECFAKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c2658bCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_7cWEIIuWEeiu6boZkiJHCA" target="_c26S4LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c2658rCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c2659rCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_fhWN4HiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEBd9qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEBd96tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEBd-KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c26587CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c2659LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c2659bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IEKA1KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_HBj6sG90EeqLWtFsc04LIg" target="_IEKA0KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IEKA1atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEKA2atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c3Dc1LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_HBj6sG90EeqLWtFsc04LIg" target="_c3Dc0LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c3Dc1bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c3ED4rCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_G9TFwG90EeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEKA1qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEKA16tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEKA2KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c3Dc1rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c3ED4LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c3ED4bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IEuolKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_IEuokKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IEuolatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IEuomatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c3zqxLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_NhvNsHiHEeiPPoPDo3q5jA" target="_c3zqwLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c3zqxbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c3zqybCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_NhrjUHiHEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IEuolqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEuol6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IEuomKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c3zqxrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c3zqx7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c3zqyLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IFk9JKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_eVdssLs6Eeiljfl0umr-iQ" target="_IFk9IKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IFk9JatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IFk9KatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c4529LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_eVdssLs6Eeiljfl0umr-iQ" target="_c4528LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c4529bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c46eArCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_eDYeMLs6Eeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IFk9JqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IFk9J6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IFk9KKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c4529rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c46eALCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c46eAbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IGEFVKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7NoX0HjAEeixydPRZ8lIKA" target="_IGEFUKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IGEFVatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IGEsYKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c5g68bCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_7NoX0HjAEeixydPRZ8lIKA" target="_c5gT4LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c5g68rCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c5g69rCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IGEFVqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IGEFV6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IGEFWKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c5g687CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c5g69LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c5g69bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IHPKBKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_IHPKAKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IHPKBatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IHPKCatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c7ROdLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_O0VSMHkwEeiO-c_khjKlFQ" target="_c7ROcLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c7ROdbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c7ROebCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_O0PLkHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IHPKBqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IHPKB6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IHPKCKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c7ROdrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c7ROd7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c7ROeLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IH8UoatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Xq0xwHkwEeiO-c_khjKlFQ" target="_IH7tkKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IH8UoqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IH8UpqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c8XapLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_Xq0xwHkwEeiO-c_khjKlFQ" target="_c8XaoLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c8XapbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c8XaqbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XqurIHkwEeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IH8Uo6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IH8UpKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IH8UpatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c8XaprCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c8Xap7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c8XaqLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IICbRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_BDZzQIuXEeiu6boZkiJHCA" target="_IICbQKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IICbRatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IIDCUqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c8f9hLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_BDZzQIuXEeiu6boZkiJHCA" target="_c8f9gLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c8f9hbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c8f9ibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aZjdUHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IICbRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIDCUKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIDCUatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c8f9hrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c8f9h7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c8f9iLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IIl04KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_-Be4sHkyEeiO-c_khjKlFQ" target="_IIlN0KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IIl04atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IIl05atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c9Z8cbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_-Be4sHkyEeiO-c_khjKlFQ" target="_c9ZVYLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c9Z8crCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c9Z8drCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IIl04qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIl046tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IIl05KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c9Z8c7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c9Z8dLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c9Z8dbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IJmhhKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_IJmhgKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IJmhhatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IJmhiatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_c_4BoLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_XVnyQHk6EeiO-c_khjKlFQ" target="_c_3akLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_c_4BobCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_c_4BpbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XVi5wHk6EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IJmhhqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IJmhh6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IJmhiKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_c_4BorCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c_4Bo7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_c_4BpLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IKsGoatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_OBTyQJs8EeikSLSDi2qpXA" target="_IKrfkKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IKsGoqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IKsGpqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dCOyFLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_OBTyQJs8EeikSLSDi2qpXA" target="_dCOyELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dCOyFbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dCOyGbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_N9lv4Js8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IKsGo6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IKsGpKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IKsGpatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dCOyFrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dCOyF7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dCOyGLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ILRVdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_s3mNEJmTEeiOmuqNbykpsw" target="_ILRVcKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ILRVdatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILRVeatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dDTwJLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_s3mNEJmTEeiOmuqNbykpsw" target="_dDTwILCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dDTwJbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dDUXMrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_syPL8JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ILRVdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILRVd6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILRVeKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dDTwJrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dDUXMLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dDUXMbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ILxEsKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_8V3R4JmTEeiOmuqNbykpsw" target="_ILwdoKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ILxEsatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ILxEtatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dEHodLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_8V3R4JmTEeiOmuqNbykpsw" target="_dEHocLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dEHodbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dEHoebCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_8Tky4JmTEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ILxEsqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILxEs6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ILxEtKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dEHodrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dEHod7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dEHoeLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IL5nlKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_VE_BkJmVEeiOmuqNbykpsw" target="_IL5nkKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IL5nlatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IL5nmatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dESAhLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_VE_BkJmVEeiOmuqNbykpsw" target="_dESAgLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dESAhbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dESAibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VE468JmVEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IL5nlqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IL5nl6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IL5nmKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dESAhrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dESAh7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dESAiLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IMAVRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_7O7aIG9zEeqLWtFsc04LIg" target="_IMAVQKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IMAVRatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IMAVSatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dEbKc7CaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_7O7aIG9zEeqLWtFsc04LIg" target="_dEajYLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dEbKdLCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dEbKeLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_7KK18G9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IMAVRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IMAVR6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IMAVSKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dEbKdbCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dEbKdrCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dEbKd7CaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IM2p0qtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_EtIM4JmWEeiOmuqNbykpsw" target="_IM2CwKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IM2p06tkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IM2p16tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dF2GwrCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_EtIM4JmWEeiOmuqNbykpsw" target="_dF1fsLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dF2Gw7CaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dF2Gx7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Es15AJmWEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IM2p1KtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IM2p1atkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IM2p1qtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dF2GxLCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dF2GxbCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dF2GxrCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_INs-ZKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_nZkr4JmYEeiOmuqNbykpsw" target="_INs-YKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_INs-ZatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_INtlcatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dHH5IbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_nZkr4JmYEeiOmuqNbykpsw" target="_dHHSELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dHH5IrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dHH5JrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nWzrwJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_INs-ZqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_INs-Z6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_INtlcKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dHH5I7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dHH5JLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dHH5JbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IN0TJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_ObaTQJmaEeiOmuqNbykpsw" target="_IN0TIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IN0TJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN0TKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dHS4RLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_ObaTQJmaEeiOmuqNbykpsw" target="_dHS4QLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dHS4RbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dHS4SbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_ObUMoJmaEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IN0TJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN0TJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN0TKKtkEeqiJu55eR3W2w"/>
-    </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IN8O8atkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1zohAG9xEeqLWtFsc04LIg" target="_IN7n4KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IN8O8qtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IN8O9qtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
-        <eObjectValue href="TapiPhotonicMedia.uml#_1vwGkG9xEeqLWtFsc04LIg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IN8O86tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN8O9KtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IN8O9atkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dHS4RrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dHS4R7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dHS4SLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IOir5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_aw4GAJmYEeiOmuqNbykpsw" target="_IOir4KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IOir5atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IOir6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dIZrgbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_aw4GAJmYEeiOmuqNbykpsw" target="_dIZEcLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dIZrgrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dIZrhrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_awx_YJmYEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IOir5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IOir56tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IOir6KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dIZrg7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dIZrhLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dIZrhbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IPDpRKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_kK61oKE8EeqPrpdMOOTlbQ" target="_IPDpQKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IPDpRatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPEQUKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dJq20bCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_kK61oKE8EeqPrpdMOOTlbQ" target="_dJqPwLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dJq20rCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dJq21rCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_kDRVgKE8EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IPDpRqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPDpR6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPDpSKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dJq207CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dJq21LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dJq21bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IPo4FKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_MlzdkJs8EeikSLSDi2qpXA" target="_IPo4EKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IPo4FatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IPpfI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dKeIFLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_MlzdkJs8EeikSLSDi2qpXA" target="_dKeIELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dKeIFbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dKevIrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IPpfIKtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPpfIatkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IPpfIqtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dKeIFrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dKevILCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dKevIbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IQvrUatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_gP2P0Lq4EeimKvjOEffRIA" target="_IQvEQKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IQvrUqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IQvrVqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dL1aAbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_gP2P0Lq4EeimKvjOEffRIA" target="_dL0y8LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dL1aArCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dL1aBrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_sPmrcLTbEeiF8sBzK2t1Sw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IQvrU6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IQvrVKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IQvrVatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dL1aA7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dL1aBLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dL1aBbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ISJZhKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_hZNgsG9wEeqLWtFsc04LIg" target="_ISJZgKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ISJZhatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ISJZiatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dNdKpLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_hZNgsG9wEeqLWtFsc04LIg" target="_dNdKoLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dNdKpbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dNdKqbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hZGL8G9wEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ISJZhqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ISJZh6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ISJZiKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dNdKprCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dNdKp7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dNdKqLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IS945KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_YH1UkG9zEeqLWtFsc04LIg" target="_IS944KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IS945atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IS946atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dOvkFLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_YH1UkG9zEeqLWtFsc04LIg" target="_dOvkELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dOvkFbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dOwLIrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_YHwcEG9zEeqLWtFsc04LIg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IS945qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IS9456tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IS946KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dOvkFrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dOwLILCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dOwLIbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_ITwjFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_ITwjEKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_ITwjFatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ITwjGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dQB9hLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_j2Dh0JCGEeq3cZ7vVOAmSw" target="_dQB9gLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dQB9hbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dQB9ibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_j1MmMJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ITwjFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ITwjF6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ITwjGKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dQB9hrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dQB9h7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dQB9iLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IUJkpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_tsusAJCGEeq3cZ7vVOAmSw" target="_IUJkoKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IUJkpatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUJkqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dQuhFLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_tsusAJCGEeq3cZ7vVOAmSw" target="_dQuhELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dQuhFbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dQvIIrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tmgvQJCGEeq3cZ7vVOAmSw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IUJkpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUJkp6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUJkqKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dQuhFrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dQvIILCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dQvIIbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IUQ5ZKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_osYdYKE2EeqPrpdMOOTlbQ" target="_IUQ5YKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IUQ5ZatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUQ5aatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dQ45JLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_osYdYKE2EeqPrpdMOOTlbQ" target="_dQ45ILCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dQ45JbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dQ45KbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_osHXoKE2EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IUQ5ZqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUQ5Z6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUQ5aKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dQ45JrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dQ45J7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dQ45KLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IUqiBKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_IUqiAKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IUqiBatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IUqiCatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dRhyVLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_pqbkkKE3EeqPrpdMOOTlbQ" target="_dRhyULCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dRhyVbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dRiZYrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_pqLs8KE3EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IUqiBqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUqiB6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IUqiCKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dRhyVrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dRiZYLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dRiZYbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IVH1AatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_z-f_8KE4EeqPrpdMOOTlbQ" target="_IVHN8KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IVH1AqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVH1BqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dSVDlLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_z-f_8KE4EeqPrpdMOOTlbQ" target="_dSVDkLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dSVDlbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dSVDmbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_z-ex0KE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IVH1A6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVH1BKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVH1BatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dSVDlrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dSVDl7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dSVDmLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_IVN7oatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_1ei2YKE4EeqPrpdMOOTlbQ" target="_IVNUkKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_IVN7oqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_IVN7pqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_dSeNgLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_1ei2YKE4EeqPrpdMOOTlbQ" target="_dSdmcLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_dSeNgbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_dSeNhbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_1ZmsAKE4EeqPrpdMOOTlbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_IVN7o6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVN7pKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_IVN7patkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_dSeNgrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dSeNg7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_dSeNhLCaEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_xbRtgHkvEeiO-c_khjKlFQ" type="PapyrusUMLClassDiagram" name="OtsiResourceSpec" measurementUnit="Pixel">
@@ -3582,133 +3525,133 @@
       <element href="TapiPhotonicMedia.uml#_wNB54KWgEeqJcvXkREZ1XQ"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wNDIAaWgEeqJcvXkREZ1XQ" x="-71" y="-384" height="50"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HgM_MKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HgM_MatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HgM_M6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_b7cJILCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_b7cJIbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b7cJI7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3qhKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HgM_MqtkEeqiJu55eR3W2w" x="443" y="-134"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_b7cJIrCaEeq6S5EiV0C3pg" x="443" y="-134"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hg7_AKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hg7_AatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hg7_A6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_b8fSALCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_b8fSAbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b8fSA7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hg7_AqtkEeqiJu55eR3W2w" x="443" y="-234"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_b8fSArCaEeq6S5EiV0C3pg" x="443" y="-234"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HhYD4KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HhYD4atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HhYD46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_b9G9ELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_b9G9EbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b9HkILCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HhYD4qtkEeqiJu55eR3W2w" x="400" y="-480"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_b9G9ErCaEeq6S5EiV0C3pg" x="400" y="-480"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HiGcoKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HiGcoatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HiHDsKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_b-s4gLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_b-s4gbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b-s4g7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3tBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HiGcoqtkEeqiJu55eR3W2w" x="860" y="-160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_b-s4grCaEeq6S5EiV0C3pg" x="860" y="-160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HjPFEKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HjPFEatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjPFE6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cAzxULCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cAzxUbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cAzxU7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjPFEqtkEeqiJu55eR3W2w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cAzxUrCaEeq6S5EiV0C3pg" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HjXA4KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HjXA4atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjXA46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cBDB4LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cBDB4bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cBDB47CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjXA4qtkEeqiJu55eR3W2w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cBDB4rCaEeq6S5EiV0C3pg" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HjeVoKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HjeVoatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjeVo6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cBTgkLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cBTgkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cBTgk7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjeVoqtkEeqiJu55eR3W2w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cBTgkrCaEeq6S5EiV0C3pg" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HjmRcKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HjmRcatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjmRc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cBj_QLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cBj_QbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cBj_Q7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HjmRcqtkEeqiJu55eR3W2w" x="860" y="-260"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cBj_QrCaEeq6S5EiV0C3pg" x="860" y="-260"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HkNVcKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HkNVcatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HkNVc6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cCtOwLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cCtOwbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cCtOw7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HkNVcqtkEeqiJu55eR3W2w" x="820" y="-340"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cCtOwrCaEeq6S5EiV0C3pg" x="820" y="-340"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hkr2kKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hkr2katkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HksdoKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cDi8QLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cDi8QbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cDi8Q7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hkr2kqtkEeqiJu55eR3W2w" x="820" y="-440"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cDi8QrCaEeq6S5EiV0C3pg" x="820" y="-440"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HltxUKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HltxUatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HltxU6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cE0HkLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cE0HkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cE0Hk7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HltxUqtkEeqiJu55eR3W2w" x="303" y="-320"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cE0HkrCaEeq6S5EiV0C3pg" x="303" y="-320"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hmud8KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hmud8atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HmvFAKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cGCPkLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cGCPkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cGCPk7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hmud8qtkEeqiJu55eR3W2w" x="303" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cGCPkrCaEeq6S5EiV0C3pg" x="303" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hm3A0KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hm3A0atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hm3A06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cGKycLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cGKycbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cGKyc7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hm3A0qtkEeqiJu55eR3W2w" x="303" y="-420"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cGKycrCaEeq6S5EiV0C3pg" x="303" y="-420"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hn-bIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hn-bIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hn-bI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cHV3ILCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cHV3IbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cHWeMLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qzTdgHk7EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hn-bIqtkEeqiJu55eR3W2w" x="220" y="-20"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cHV3IrCaEeq6S5EiV0C3pg" x="220" y="-20"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HpqdMKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HpqdMatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HpqdM6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cK_oELCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cK_oEbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cK_oE7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HpqdMqtkEeqiJu55eR3W2w" x="640" y="160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cK_oErCaEeq6S5EiV0C3pg" x="640" y="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hq3XEKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hq3-IKtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hq3-IqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cM9W8LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cM9W8bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cM9-ALCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hq3-IatkEeqiJu55eR3W2w" x="1080" y="180"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cM9W8rCaEeq6S5EiV0C3pg" x="1080" y="180"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_xbR3JHkvEeiO-c_khjKlFQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_xbR3JXkvEeiO-c_khjKlFQ"/>
@@ -3968,165 +3911,165 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49ELucEeiljfl0umr-iQ" id="(0.7486631016042781,1.0)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Y-49EbucEeiljfl0umr-iQ" id="(0.5865102639296188,0.0)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HgM_NKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_HgM_MKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HgM_NatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HgM_OatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_b7cJJLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbRtvnkvEeiO-c_khjKlFQ" target="_b7cJILCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_b7cJJbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b7cJKbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3qhKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HgM_NqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HgM_N6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HgM_OKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_b7cJJrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b7cJJ7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b7cJKLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Hg7_BKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_MtNH8IuXEeiu6boZkiJHCA" target="_Hg7_AKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Hg7_BatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hg8mEqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_b8fSBLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_MtNH8IuXEeiu6boZkiJHCA" target="_b8fSALCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_b8fSBbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b8fSCbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3ohKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hg7_BqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hg8mEKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hg8mEatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_b8fSBrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b8fSB7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b8fSCLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HhYD5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRupnkvEeiO-c_khjKlFQ" target="_HhYD4KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HhYD5atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HhYD6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_b9HkIbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbRupnkvEeiO-c_khjKlFQ" target="_b9G9ELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_b9HkIrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b9HkJrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HhYD5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HhYD56tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HhYD6KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_b9HkI7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b9HkJLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b9HkJbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HiHDsatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRu43kvEeiO-c_khjKlFQ" target="_HiGcoKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HiHDsqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HiHDtqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_b-s4hLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbRu43kvEeiO-c_khjKlFQ" target="_b-s4gLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_b-s4hbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_b-s4ibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3tBKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HiHDs6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HiHDtKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HiHDtatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_b-s4hrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b-s4h7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_b-s4iLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HjPFFKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_QoX9AIuXEeiu6boZkiJHCA" target="_HjPFEKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HjPFFatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjPFGatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cAzxVLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_QoX9AIuXEeiu6boZkiJHCA" target="_cAzxULCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cAzxVbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cA0YYbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3phKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjPFFqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjPFF6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjPFGKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cAzxVrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cAzxV7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cA0YYLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HjXA5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_zM5mgJs5EeikSLSDi2qpXA" target="_HjXA4KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HjXA5atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjXA6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cBDB5LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_zM5mgJs5EeikSLSDi2qpXA" target="_cBDB4LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cBDB5bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cBDB6bCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_zJXKUJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjXA5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjXA56tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjXA6KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cBDB5rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cBDB57CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cBDB6LCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HjeVpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_2HPJUJs8EeikSLSDi2qpXA" target="_HjeVoKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HjeVpatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjeVqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cBTglLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_2HPJUJs8EeikSLSDi2qpXA" target="_cBTgkLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cBTglbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cBTgmbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_2EwdEJs8EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjeVpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjeVp6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjeVqKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cBTglrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cBTgl7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cBTgmLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HjmRdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_Y349MLucEeiljfl0umr-iQ" target="_HjmRcKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HjmRdatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HjmReatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cBj_RLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_Y349MLucEeiljfl0umr-iQ" target="_cBj_QLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cBj_RbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cBj_SbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Y0iHMLucEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HjmRdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjmRd6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HjmReKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cBj_RrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cBj_R7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cBj_SLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HkNVdKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_HkNVcKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HkNVdatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HkNVeatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cCtOxLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbRvg3kvEeiO-c_khjKlFQ" target="_cCtOwLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cCtOxbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cCt10rCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_KjQ3rRKOEeajhbtskMXJfw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HkNVdqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HkNVd6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HkNVeKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cCtOxrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cCt10LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cCt10bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HksdoatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbR3SXkvEeiO-c_khjKlFQ" target="_Hkr2kKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HksdoqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HksdpqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cDi8RLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbR3SXkvEeiO-c_khjKlFQ" target="_cDi8QLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cDi8RbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cDi8SbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wY7M4BNCEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hksdo6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HksdpKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HksdpatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cDi8RrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cDi8R7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cDi8SLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HltxVKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_HltxUKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HltxVatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HluYYKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cE0HlLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbRyc3kvEeiO-c_khjKlFQ" target="_cE0HkLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cE0HlbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cE0HmbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_mXvsEHZlEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HltxVqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HltxV6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HltxWKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cE0HlrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cE0Hl7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cE0HmLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HmvFAatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_xbR393kvEeiO-c_khjKlFQ" target="_Hmud8KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HmvFAqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HmvFBqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cGCPlLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xbR393kvEeiO-c_khjKlFQ" target="_cGCPkLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cGCPlbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cGCPmbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_XCHpEHZpEeiPPoPDo3q5jA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HmvFA6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HmvFBKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HmvFBatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cGCPlrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cGCPl7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cGCPmLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Hm3n4KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_KmsHYIuXEeiu6boZkiJHCA" target="_Hm3A0KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Hm3n4atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hm3n5atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cGKydLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_KmsHYIuXEeiu6boZkiJHCA" target="_cGKycLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cGKydbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cGKyebCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_AMK4gHk8EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hm3n4qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hm3n46tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hm3n5KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cGKydrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cGKyd7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cGKyeLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Hn-bJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_sregEHk7EeiO-c_khjKlFQ" target="_Hn-bIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Hn-bJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hn-bKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cHWeMbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_sregEHk7EeiO-c_khjKlFQ" target="_cHV3ILCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cHWeMrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cHWeNrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qzTdgHk7EeiO-c_khjKlFQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hn-bJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hn-bJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hn-bKKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cHWeM7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cHWeNLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cHWeNbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HprEQKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_wHswIJs5EeikSLSDi2qpXA" target="_HpqdMKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HprEQatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HprERatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cK_oFLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_wHswIJs5EeikSLSDi2qpXA" target="_cK_oELCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cK_oFbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cLAPIrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_wHacQJs5EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HprEQqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HprEQ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HprERKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cK_oFrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cLAPILCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cLAPIbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Hq3-I6tkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_-2iRMJs7EeikSLSDi2qpXA" target="_Hq3XEKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Hq3-JKtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hq3-KKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cM9-AbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_-2iRMJs7EeikSLSDi2qpXA" target="_cM9W8LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cM9-ArCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cM9-BrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hq3-JatkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hq3-JqtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hq3-J6tkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cM9-A7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cM9-BLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cM9-BbCaEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_3bpg4IoMEeivCevppATXng" type="PapyrusUMLClassDiagram" name="McResourceSpec" measurementUnit="Pixel">
@@ -4419,149 +4362,149 @@
       <element href="TapiPhotonicMedia.uml#_gQZQUKWbEeqJcvXkREZ1XQ"/>
       <layoutConstraint xsi:type="notation:Bounds" xmi:id="_gQsLQaWbEeqJcvXkREZ1XQ" x="482" y="-283" height="34"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_HzK-gKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_HzK-gatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HzK-g6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cdOAgLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cdOAgbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cdOnkLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_HzK-gqtkEeqiJu55eR3W2w" x="654" y="-442"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cdOAgrCaEeq6S5EiV0C3pg" x="654" y="-442"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_Hz1F0KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_Hz1F0atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hz1F06tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ceH_cLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ceH_cbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ceH_c7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Hz1F0qtkEeqiJu55eR3W2w" x="627" y="-53"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ceH_crCaEeq6S5EiV0C3pg" x="627" y="-53"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H0PVgKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H0PVgatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0PVg6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ceo80LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ceo80bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ceo807CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H0PVgqtkEeqiJu55eR3W2w" x="627" y="-153"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ceo80rCaEeq6S5EiV0C3pg" x="627" y="-153"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H0WDMKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H0WDMatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0WDM6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cevqgLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cevqgbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cevqg7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H0WDMqtkEeqiJu55eR3W2w" x="627" y="-153"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cevqgrCaEeq6S5EiV0C3pg" x="627" y="-153"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H03noKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H03noatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H03no6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cfbnALCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cfbnAbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cfbnA7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H03noqtkEeqiJu55eR3W2w" x="1127" y="-51"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cfbnArCaEeq6S5EiV0C3pg" x="1127" y="-51"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H1XW4KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H1XW4atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1XW46tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cgCrALCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cgCrAbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cgCrA7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H1XW4qtkEeqiJu55eR3W2w" x="1127" y="-151"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cgCrArCaEeq6S5EiV0C3pg" x="1127" y="-151"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H1eroKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H1eroatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1ero6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cgO4QLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cgO4QbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cgO4Q7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H1eroqtkEeqiJu55eR3W2w" x="1127" y="-151"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cgO4QrCaEeq6S5EiV0C3pg" x="1127" y="-151"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H2KoIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H2KoIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2KoI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_chTPQLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_chTPQbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_chTPQ7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H2KoIqtkEeqiJu55eR3W2w" x="809" y="148"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_chTPQrCaEeq6S5EiV0C3pg" x="809" y="148"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H22koKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H22koatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H22ko6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ciVKALCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ciVKAbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ciVxELCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H22koqtkEeqiJu55eR3W2w" x="809" y="48"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ciVKArCaEeq6S5EiV0C3pg" x="809" y="48"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H2_HgKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H2_HgatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2_ukKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cih-ULCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cih-UbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ciilYLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H2_HgqtkEeqiJu55eR3W2w" x="809" y="48"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cih-UrCaEeq6S5EiV0C3pg" x="809" y="48"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H3YwIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H3YwIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H3YwI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cjOh4LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cjOh4bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cjOh47CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H3YwIqtkEeqiJu55eR3W2w" x="117" y="-448"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cjOh4rCaEeq6S5EiV0C3pg" x="117" y="-448"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H4C3cKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H4C3catkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4C3c6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_ckTf8LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_ckTf8bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ckTf87CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4C3cqtkEeqiJu55eR3W2w" x="109" y="-294"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_ckTf8rCaEeq6S5EiV0C3pg" x="109" y="-294"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H4dHIKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H4dHIatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4dHI6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_clH_ULCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_clH_UbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_clH_U7CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4dHIqtkEeqiJu55eR3W2w" x="109" y="-394"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_clH_UrCaEeq6S5EiV0C3pg" x="109" y="-394"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H4imsKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H4imsatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4ims6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_clS-cLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_clTlgLCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_clTlgrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hv9NsNnYEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4imsqtkEeqiJu55eR3W2w" x="109" y="-394"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_clTlgbCaEeq6S5EiV0C3pg" x="109" y="-394"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H4_5sKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H4_5satkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4_5s6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cmHd0LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cmHd0bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cmHd07CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H4_5sqtkEeqiJu55eR3W2w" x="160"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cmHd0rCaEeq6S5EiV0C3pg" x="160"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H6Qd8KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H6Qd8atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6RFAKtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_coEloLCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_coElobCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_coFMsLCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H6Qd8qtkEeqiJu55eR3W2w" x="609" y="-244"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_coElorCaEeq6S5EiV0C3pg" x="609" y="-244"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H6tw8KtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H6tw8atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6tw86tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cpBA0LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cpBA0bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cpBA07CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H6tw8qtkEeqiJu55eR3W2w" x="609" y="-344"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cpBA0rCaEeq6S5EiV0C3pg" x="609" y="-344"/>
     </children>
-    <children xsi:type="notation:Shape" xmi:id="_H7NgMKtkEeqiJu55eR3W2w" type="StereotypeComment">
-      <styles xsi:type="notation:TitleStyle" xmi:id="_H7NgMatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H7NgM6tkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <children xsi:type="notation:Shape" xmi:id="_cp7m0LCaEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xsi:type="notation:TitleStyle" xmi:id="_cp7m0bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cp7m07CaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_H7NgMqtkEeqiJu55eR3W2w" x="875" y="392"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_cp7m0rCaEeq6S5EiV0C3pg" x="875" y="392"/>
     </children>
     <styles xsi:type="notation:StringValueStyle" xmi:id="_3bpg4YoMEeivCevppATXng" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_3bpg4ooMEeivCevppATXng"/>
@@ -4852,185 +4795,185 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PbcPEMMqEei3gLXE4_XcoA" id="(1.0,0.5846153846153846)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_PbcPEcMqEei3gLXE4_XcoA" id="(0.0,0.49230769230769234)"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_HzK-hKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_SvF9cJozEeiOmuqNbykpsw" target="_HzK-gKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_HzK-hatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_HzLlkqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cdOnkbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_SvF9cJozEeiOmuqNbykpsw" target="_cdOAgLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cdOnkrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cdOnlrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_HzK-hqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HzLlkKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_HzLlkatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cdOnk7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cdOnlLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cdOnlbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_Hz1F1KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_aiK4MJozEeiOmuqNbykpsw" target="_Hz1F0KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_Hz1F1atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_Hz1s4KtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ceH_dLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_aiK4MJozEeiOmuqNbykpsw" target="_ceH_cLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ceH_dbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ceH_ebCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_aiExkJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Hz1F1qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hz1F16tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_Hz1F2KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ceH_drCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ceH_d7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ceH_eLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H0PVhKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_c-z5wZozEeiOmuqNbykpsw" target="_H0PVgKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H0PVhatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0PViatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ceo81LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_c-z5wZozEeiOmuqNbykpsw" target="_ceo80LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ceo81bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ceo82bCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_c-z5wJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H0PVhqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0PVh6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0PViKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ceo81rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ceo817CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ceo82LCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H0WDNKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_qPcpYJozEeiOmuqNbykpsw" target="_H0WDMKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H0WDNatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H0WDOatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cevqhLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_qPcpYJozEeiOmuqNbykpsw" target="_cevqgLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cevqhbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cevqibCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qOr0YJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H0WDNqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0WDN6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H0WDOKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cevqhrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cevqh7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cevqiLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H03npKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_a2-DgpozEeiOmuqNbykpsw" target="_H03noKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H03npatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H03nqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cfbnBLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_a2-DgpozEeiOmuqNbykpsw" target="_cfbnALCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cfbnBbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cfbnCbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_a2384JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H03npqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H03np6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H03nqKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cfbnBrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cfbnB7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cfbnCLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H1XW5KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_dbbkUJozEeiOmuqNbykpsw" target="_H1XW4KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H1XW5atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1XW6atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cgCrBLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_dbbkUJozEeiOmuqNbykpsw" target="_cgCrALCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cgCrBbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cgDSELCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dbVdsJozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H1XW5qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1XW56tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1XW6KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cgCrBrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cgCrB7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cgCrCLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H1erpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_quGUQJozEeiOmuqNbykpsw" target="_H1eroKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H1erpatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H1erqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cgO4RLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_quGUQJozEeiOmuqNbykpsw" target="_cgO4QLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cgO4RbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cgPfUbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_qtbl4JozEeiOmuqNbykpsw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H1erpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1erp6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H1erqKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cgO4RrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cgO4R7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cgPfULCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H2KoJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_lvNYYJozEeiOmuqNbykpsw" target="_H2KoIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H2KoJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2KoKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_chT2ULCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_lvNYYJozEeiOmuqNbykpsw" target="_chTPQLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_chT2UbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_chT2VbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_nBhMkI6cEeeyZasfnNSonw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H2KoJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2KoJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2KoKKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_chT2UrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_chT2U7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_chT2VLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H22kpKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_avUEAJs-EeikSLSDi2qpXA" target="_H22koKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H22kpatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H22kqatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ciVxEbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_avUEAJs-EeikSLSDi2qpXA" target="_ciVKALCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ciVxErCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ciVxFrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_GXqq4Js9EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H22kpqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H22kp6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H22kqKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ciVxE7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ciVxFLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ciVxFbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H2_ukatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_tTykMLudEeiljfl0umr-iQ" target="_H2_HgKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H2_ukqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H2_ulqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ciilYbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_tTykMLudEeiljfl0umr-iQ" target="_cih-ULCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ciilYrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ciilZrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_tRVGELudEeiljfl0umr-iQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H2_uk6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2_ulKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H2_ulatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ciilY7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ciilZLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ciilZbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H3YwJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5DNQpo1EeiOmuqNbykpsw" target="_H3YwIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H3YwJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H3ZXMqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cjPI8LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_F5DNQpo1EeiOmuqNbykpsw" target="_cjOh4LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cjPI8bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cjPI9bCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H3YwJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H3ZXMKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H3ZXMatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cjPI8rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cjPI87CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cjPI9LCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H4C3dKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_H4C3cKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H4C3datkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4C3eatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_ckUHALCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_F5JT0Jo1EeiOmuqNbykpsw" target="_ckTf8LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_ckUHAbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_ckUHBbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_VvSIYEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4C3dqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4C3d6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4C3eKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_ckUHArCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ckUHA7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_ckUHBLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H4dHJKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5DNMJo1EeiOmuqNbykpsw" target="_H4dHIKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H4dHJatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4dHKatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_clH_VLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_F5DNMJo1EeiOmuqNbykpsw" target="_clH_ULCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_clH_VbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_clH_WbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_Z6tlUBNAEeeQQtMBY9ly8w"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4dHJqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4dHJ6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4dHKKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_clH_VrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_clH_V7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_clH_WLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H4imtKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5JURJo1EeiOmuqNbykpsw" target="_H4imsKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H4imtatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H4imuatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_clUMkLCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_F5JURJo1EeiOmuqNbykpsw" target="_clS-cLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_clUMkbCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_clUMlbCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_hv9NsNnYEeWIOYiRCk5bbQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4imtqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4imt6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H4imuKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_clUMkrCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_clUMk7CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_clUMlLCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H4_5tKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_F5JUXpo1EeiOmuqNbykpsw" target="_H4_5sKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H4_5tatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H5AgwqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cmHd1LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_F5JUXpo1EeiOmuqNbykpsw" target="_cmHd0LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cmHd1bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cmIE4LCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_PKMDsEUIEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H4_5tqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H5AgwKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H5AgwatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cmHd1rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cmHd17CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cmHd2LCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H6RFAatkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_WDKY0JqMEeid4dfn4JFJZg" target="_H6Qd8KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H6RFAqtkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6RFBqtkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_coFMsbCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WDKY0JqMEeid4dfn4JFJZg" target="_coEloLCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_coFMsrCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_coFMtrCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_WCN9oJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H6RFA6tkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6RFBKtkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6RFBatkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_coFMs7CaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_coFMtLCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_coFMtbCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H6tw9KtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_dkQywJqMEeid4dfn4JFJZg" target="_H6tw8KtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H6tw9atkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H6tw-atkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cpBA1LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_dkQywJqMEeid4dfn4JFJZg" target="_cpBA0LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cpBA1bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cpBn4rCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_dkJeAJqMEeid4dfn4JFJZg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H6tw9qtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6tw96tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H6tw-KtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cpBA1rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cpBn4LCaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cpBn4bCaEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xsi:type="notation:Connector" xmi:id="_H7NgNKtkEeqiJu55eR3W2w" type="StereotypeCommentLink" source="_asvRIJs-EeikSLSDi2qpXA" target="_H7NgMKtkEeqiJu55eR3W2w">
-      <styles xsi:type="notation:FontStyle" xmi:id="_H7NgNatkEeqiJu55eR3W2w"/>
-      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_H7NgOatkEeqiJu55eR3W2w" name="BASE_ELEMENT">
+    <edges xsi:type="notation:Connector" xmi:id="_cp7m1LCaEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_asvRIJs-EeikSLSDi2qpXA" target="_cp7m0LCaEeq6S5EiV0C3pg">
+      <styles xsi:type="notation:FontStyle" xmi:id="_cp7m1bCaEeq6S5EiV0C3pg"/>
+      <styles xsi:type="notation:EObjectValueStyle" xmi:id="_cp7m2bCaEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue href="TapiPhotonicMedia.uml#_-2cKkJs7EeikSLSDi2qpXA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_H7NgNqtkEeqiJu55eR3W2w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H7NgN6tkEeqiJu55eR3W2w"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_H7NgOKtkEeqiJu55eR3W2w"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_cp7m1rCaEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cp7m17CaEeq6S5EiV0C3pg"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_cp7m2LCaEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_47kdwPJSEeiTnqcAgKK24Q" type="PapyrusUMLClassDiagram" name="ServiceInterfaceSpec" measurementUnit="Pixel">
diff --git a/UML/TapiPhotonicMedia.uml b/UML/TapiPhotonicMedia.uml
index 37ca10c3..07870531 100644
--- a/UML/TapiPhotonicMedia.uml
+++ b/UML/TapiPhotonicMedia.uml
@@ -39,7 +39,7 @@ License: This module is distributed under the Apache License 2.0</body>
         </ownedComment>
         <supplier xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XCHpEHZpEeiPPoPDo3q5jA" name="OtsiGCepSpecAugmentsCep" client="_UyBxsBKOEeajhbtskMXJfw">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XCHpEHZpEeiPPoPDo3q5jA" name="OtsiGCepSpecAugmentsCep" client="_mXvsEHZlEeiPPoPDo3q5jA">
         <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_fhWN4HiHEeiPPoPDo3q5jA" name="OtsiSipHasOtsiCapabilityPac" memberEnd="_fhbGYHiHEeiPPoPDo3q5jA _fhbtcHiHEeiPPoPDo3q5jA">
@@ -90,7 +90,7 @@ License: This module is distributed under the Apache License 2.0</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uzBycJmoEeiOmuqNbykpsw" value="1"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ObUMoJmaEeiOmuqNbykpsw" name="McCsepSpecAugmentsCsep" client="_UyBxsBKOEeajhbtskMXJfw">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ObUMoJmaEeiOmuqNbykpsw" name="McCsepSpecAugmentsCsep" client="_Es15AJmWEeiOmuqNbykpsw">
         <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_c-z5wJozEeiOmuqNbykpsw" name="McCepSpecAugmentsCep" client="_aiExkJozEeiOmuqNbykpsw">
@@ -235,12 +235,6 @@ License: This module is distributed under the Apache License 2.0</body>
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_z7sXYPPnEeinaYo1FpF9OA" name="OtsiCepSpecAugmentsCepDetailsOutput" client="_KjQ3rRKOEeajhbtskMXJfw">
         <supplier xmi:type="uml:Operation" href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_1vwGkG9xEeqLWtFsc04LIg" name="McCsepHasPowerConfigPac" memberEnd="_1vzJ4G9xEeqLWtFsc04LIg _1v20QW9xEeqLWtFsc04LIg">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1vx7wG9xEeqLWtFsc04LIg" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1vx7wW9xEeqLWtFsc04LIg" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_1v20QW9xEeqLWtFsc04LIg" name="mediachannelconnectivityserviceendpointspec" type="_Es15AJmWEeiOmuqNbykpsw" association="_1vwGkG9xEeqLWtFsc04LIg"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_7KK18G9zEeqLWtFsc04LIg" name="McSipHasPowerCapabilityPac" memberEnd="_7KLdAm9zEeqLWtFsc04LIg _7KPucW9zEeqLWtFsc04LIg">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KLdAG9zEeqLWtFsc04LIg" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KLdAW9zEeqLWtFsc04LIg" key="nature" value="UML_Nature"/>
@@ -388,20 +382,16 @@ License: This module is distributed under the Apache License 2.0</body>
         <ownedComment xmi:type="uml:Comment" xmi:id="_CosS4LKjEei69qzpcujF2A" annotatedElement="_NhrjUHiHEeiPPoPDo3q5jA">
           <body>Can read the status of the warning for the upper value that the power can reach.</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_x9XaUJJmEee26o4qs2D5Ig" name="supportableLowerCentralFrequency" type="_KjQ3xBKOEeajhbtskMXJfw" isReadOnly="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_x9XaUJJmEee26o4qs2D5Ig" name="supportableCentralFrequencySpectrumBand" type="_-2hW8LAhEeq6S5EiV0C3pg" isReadOnly="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_pXy3ULDqEeiUZaG2JnNtGQ" annotatedElement="_x9XaUJJmEee26o4qs2D5Ig">
-            <body>The lower frequency of the channel spectrum</body>
+            <body>Each spectrum band supported for otsi trasmitter to be tuned on,&#xD;
+is specified as per it's lower and upper central frequencies supported and its frequency constraints,&#xD;
+consisting in the frequency Grid and the AdjustmentGranularity,&#xD;
+used to uniquely identify all central frequencies supported within the band.</body>
           </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KgckgM4xEeehIvzuBRCtZQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KgdyoM4xEeehIvzuBRCtZQ" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_t2oxcI50EeeyZasfnNSonw" name="supportableUpperCentralFrequency" type="_KjQ3xBKOEeajhbtskMXJfw" isReadOnly="true">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_qWfUMLDqEeiUZaG2JnNtGQ" annotatedElement="_t2oxcI50EeeyZasfnNSonw">
-            <body>The Upper frequency of the channel spectrum</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LI65wM4xEeehIvzuBRCtZQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LI8H4M4xEeehIvzuBRCtZQ" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_7gkK0I50EeeyZasfnNSonw" name="supportableApplicationIdentifier" type="_KjQ3vRKOEeajhbtskMXJfw" isReadOnly="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_Jh7cgLDrEeiUZaG2JnNtGQ" annotatedElement="_7gkK0I50EeeyZasfnNSonw">
             <body>The list of supportable ApplicationIdentifiers.</body>
@@ -550,10 +540,6 @@ In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPoint
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nWzrxpmYEeiOmuqNbykpsw" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nWzrx5mYEeiOmuqNbykpsw" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_1vzJ4G9xEeqLWtFsc04LIg" name="_powerManagementConfig" type="_hZGL8G9wEeqLWtFsc04LIg" aggregation="composite" association="_1vwGkG9xEeqLWtFsc04LIg">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1v2NMW9xEeqLWtFsc04LIg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1v20QG9xEeqLWtFsc04LIg" value="1"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_awx_YJmYEeiOmuqNbykpsw" name="MediaChannelConfigPac">
         <ownedComment xmi:type="uml:Comment" xmi:id="_zP1YkKr7EeqiJu55eR3W2w" annotatedElement="_awx_YJmYEeiOmuqNbykpsw">
@@ -715,7 +701,7 @@ at the Logical-Termination-Point (LTP) associated to the SIP.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_pqLs8KE3EeqPrpdMOOTlbQ" name="MediaChannelAConnectivityServiceEndPointSpec">
+      <packagedElement xmi:type="uml:Class" xmi:id="_pqLs8KE3EeqPrpdMOOTlbQ" name="McaConnectivityServiceEndPointSpec">
         <ownedComment xmi:type="uml:Comment" xmi:id="_tTqKgKr6EeqiJu55eR3W2w" annotatedElement="_pqLs8KE3EeqPrpdMOOTlbQ">
           <body>This class allows the provisioning of MCA/OTSiMCA (*) ConnectivityService.&#xD;
 It is possible to provision either&#xD;
@@ -743,7 +729,7 @@ Capacity cannot be omitted if spectrum is not specified.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I2SboKGQEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_j1MmMJCGEeq3cZ7vVOAmSw" name="OtsiAConnectivityServiceEndPointSpec">
+      <packagedElement xmi:type="uml:Class" xmi:id="_j1MmMJCGEeq3cZ7vVOAmSw" name="OtsiaConnectivityServiceEndPointSpec">
         <ownedComment xmi:type="uml:Comment" xmi:id="_un5ZkKr6EeqiJu55eR3W2w" annotatedElement="_j1MmMJCGEeq3cZ7vVOAmSw">
           <body>This class allows the provisioning of OTSiA (*) ConnectivityService.&#xD;
 It is possible to either &#xD;
@@ -989,6 +975,27 @@ Tag as deprecated SMCA, replace by MCA</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ep3ToG9yEeqLWtFsc04LIg"/>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_-2hW8LAhEeq6S5EiV0C3pg" name="CentralFrequencyBand">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_D8VaMLAiEeq6S5EiV0C3pg" annotatedElement="_-2hW8LAhEeq6S5EiV0C3pg">
+          <body>This data-type represents a range of central frequency spectrum band specified as lower and upper bounds, inclusive of the bound values.&#xD;
+It also holds frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_PGx5YLAiEeq6S5EiV0C3pg" name="lowerCentralFrequency">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PGx5YbAiEeq6S5EiV0C3pg" annotatedElement="_PGx5YLAiEeq6S5EiV0C3pg">
+            <body>The lower central frequency that can be tuned in the laser specified in MHz.&#xD;
+It is the oscillation frequency of the corresponding electromagnetic wave. </body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_XL3xMLAiEeq6S5EiV0C3pg" name="upperCentralFrequency">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_XL3xMbAiEeq6S5EiV0C3pg" annotatedElement="_XL3xMLAiEeq6S5EiV0C3pg">
+            <body>The upper central frequency that can be tuned in the laser specified in MHz.&#xD;
+ It is the oscillation frequency of the corresponding electromagnetic wave. </body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_jmZ_QLAiEeq6S5EiV0C3pg" name="frequencyConstraint" type="_nCmdAMG-EeiAg83ctgK3eQ"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_MSvNkBMEEeaOevPmmmHXcA" name="Imports">
       <packageImport xmi:type="uml:PackageImport" xmi:id="_eTzcwDK1Eeau3Z0jZdArnw">
@@ -1069,8 +1076,6 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_YKbQA1qoEeexvMtO2oNM9g" base_Class="_PKMDsEUIEead1bezhJG4aw"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_KjT68BKOEeajhbtskMXJfw" base_Class="_KjQ3tBKOEeajhbtskMXJfw"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_YKbQAlqoEeexvMtO2oNM9g" base_Class="_KjQ3tBKOEeajhbtskMXJfw"/>
-  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_t2pYgI50EeeyZasfnNSonw" base_Property="_t2oxcI50EeeyZasfnNSonw" attributeValueChangeNotification="YES" bitLength="LENGTH_64_BIT"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_t2p_kI50EeeyZasfnNSonw" base_StructuralFeature="_t2oxcI50EeeyZasfnNSonw" valueRange="" unit=""/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_7gkx4I50EeeyZasfnNSonw" base_Property="_7gkK0I50EeeyZasfnNSonw" attributeValueChangeNotification="YES"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_7gkx4Y50EeeyZasfnNSonw" base_StructuralFeature="_7gkK0I50EeeyZasfnNSonw" valueRange="255"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_MpI1UI51EeeyZasfnNSonw" base_Property="_MpIOQI51EeeyZasfnNSonw"/>
@@ -1406,10 +1411,6 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="__XhHgG9wEeqLWtFsc04LIg" base_Property="__XcPAG9wEeqLWtFsc04LIg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_SLxQsm9xEeqLWtFsc04LIg" base_StructuralFeature="_SLxQsG9xEeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_SL2JMG9xEeqLWtFsc04LIg" base_Property="_SLxQsG9xEeqLWtFsc04LIg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1vzJ4W9xEeqLWtFsc04LIg" base_StructuralFeature="_1vzJ4G9xEeqLWtFsc04LIg"/>
-  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_1v2NMG9xEeqLWtFsc04LIg" base_Property="_1vzJ4G9xEeqLWtFsc04LIg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1v20Qm9xEeqLWtFsc04LIg" base_StructuralFeature="_1v20QW9xEeqLWtFsc04LIg"/>
-  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_1v20Q29xEeqLWtFsc04LIg" base_Property="_1v20QW9xEeqLWtFsc04LIg"/>
   <OpenModel_Profile:Experimental xmi:id="_YpiI4G9yEeqLWtFsc04LIg" base_Element="_05Y7wG9wEeqLWtFsc04LIg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_YHwcEW9zEeqLWtFsc04LIg" base_Class="_YHwcEG9zEeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_YHzfYG9zEeqLWtFsc04LIg" base_Class="_YHwcEG9zEeqLWtFsc04LIg"/>
@@ -1429,7 +1430,6 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_G9WwIG90EeqLWtFsc04LIg" base_Property="_G9Ts0m90EeqLWtFsc04LIg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_G9hIMW90EeqLWtFsc04LIg" base_StructuralFeature="_G9hIMG90EeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_G9hvQG90EeqLWtFsc04LIg" base_Property="_G9hIMG90EeqLWtFsc04LIg"/>
-  <OpenModel_Profile:StrictComposite xmi:id="_ERfi4IJkEeqLl4tIPv2RCg" base_Association="_1vwGkG9xEeqLWtFsc04LIg"/>
   <OpenModel_Profile:StrictComposite xmi:id="_H2D10IJkEeqLl4tIPv2RCg" base_Association="_7KK18G9zEeqLWtFsc04LIg"/>
   <OpenModel_Profile:StrictComposite xmi:id="_L6UVcIJkEeqLl4tIPv2RCg" base_Association="_G9TFwG90EeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_j1N0UJCGEeq3cZ7vVOAmSw" base_Class="_j1MmMJCGEeq3cZ7vVOAmSw"/>
@@ -1469,4 +1469,11 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenModel_Profile:Deprecated xmi:id="_1OGnEKWgEeqJcvXkREZ1XQ" base_Element="_mXvsEHZlEeiPPoPDo3q5jA"/>
   <OpenModel_Profile:Deprecated xmi:id="_HyxcIKWhEeqJcvXkREZ1XQ" base_Element="_qzTdgHk7EeiO-c_khjKlFQ"/>
   <OpenModel_Profile:Deprecated xmi:id="_L-qNwKWhEeqJcvXkREZ1XQ" base_Element="_KjQ3qhKOEeajhbtskMXJfw"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_PGzHgLAiEeq6S5EiV0C3pg" base_Property="_PGx5YLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_PHFbYLAiEeq6S5EiV0C3pg" base_StructuralFeature="_PGx5YLAiEeq6S5EiV0C3pg" partOfObjectKey="1"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_XL4YQLAiEeq6S5EiV0C3pg" base_Property="_XL3xMLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_XMI28LAiEeq6S5EiV0C3pg" base_StructuralFeature="_XL3xMLAiEeq6S5EiV0C3pg" partOfObjectKey="2"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_jmamULAiEeq6S5EiV0C3pg" base_Property="_jmZ_QLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_jmrFALAiEeq6S5EiV0C3pg" base_StructuralFeature="_jmZ_QLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:Experimental xmi:id="_4_eOkLAiEeq6S5EiV0C3pg" base_Element="_-2hW8LAhEeq6S5EiV0C3pg"/>
 </xmi:XMI>
diff --git a/UML/TapiTopology.notation b/UML/TapiTopology.notation
index 39874816..f2a24631 100644
--- a/UML/TapiTopology.notation
+++ b/UML/TapiTopology.notation
@@ -510,6 +510,7 @@
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_RVPvQIuFEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="__4r3sK7mEeq6S5EiV0C3pg" name="css_stylesheets" eObjectListValue="__4ki8K7mEeq6S5EiV0C3pg _ARL3QK7nEeq6S5EiV0C3pg"/>
     <element xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     <edges xmi:type="notation:Connector" xmi:id="_KKjrAHh_EeqVN_GB3rPx7g" type="Usage_Edge" source="_4tEgcHh-EeqVN_GB3rPx7g" target="_4uNI4Hh-EeqVN_GB3rPx7g">
       <children xmi:type="notation:DecorationNode" xmi:id="_KKjrA3h_EeqVN_GB3rPx7g" type="Usage_NameLabel">
@@ -666,22 +667,6 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NP2C5DBDEea4fKwSGMr6CA" x="524" y="54" height="93"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_EpWpODBKEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_EpWpOTBKEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EpWpOzBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpWpOjBKEeaSroGqGbZ6jg" x="204" y="153"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Ep8e-zBKEeaSroGqGbZ6jg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Ep8e_DBKEeaSroGqGbZ6jg" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ep8e_jBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ep8e_TBKEeaSroGqGbZ6jg" x="629" y="137"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_EqsGNjBKEeaSroGqGbZ6jg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_EqsGNzBKEeaSroGqGbZ6jg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EqsGOTBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
@@ -732,14 +717,6 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9hBpMVSgEeacRKRpk6W3Lw" x="144" y="367" width="164" height="82"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_9hUkI1SgEeacRKRpk6W3Lw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9hUkJFSgEeacRKRpk6W3Lw" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9hUkJlSgEeacRKRpk6W3Lw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9hUkJVSgEeacRKRpk6W3Lw" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_9jQd01SgEeacRKRpk6W3Lw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_9jQd1FSgEeacRKRpk6W3Lw" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9jQd1lSgEeacRKRpk6W3Lw" name="BASE_ELEMENT">
@@ -782,14 +759,6 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RnAzUag5EeeAVfY3jqnvAA" x="523" y="158" height="87"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_RnIIE6g5EeeAVfY3jqnvAA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_RnIIFKg5EeeAVfY3jqnvAA" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_RnIIFqg5EeeAVfY3jqnvAA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RnIIFag5EeeAVfY3jqnvAA" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_eDcusMZdEeeAD9H5zOiMUQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_eDcuscZdEeeAD9H5zOiMUQ" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_eDdVwMZdEeeAD9H5zOiMUQ" name="BASE_ELEMENT">
@@ -904,14 +873,6 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gCWC0RNVEeiKtYjI8wVF7A" x="523" y="256" height="86"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_gCpk0xNVEeiKtYjI8wVF7A" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_gCpk1BNVEeiKtYjI8wVF7A" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gCpk1hNVEeiKtYjI8wVF7A" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gCpk1RNVEeiKtYjI8wVF7A" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_CjjE8CPcEei-6ZTMWyFzXg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_CjjE8SPcEei-6ZTMWyFzXg" showTitle="true"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CjjsACPcEei-6ZTMWyFzXg" name="BASE_ELEMENT">
@@ -984,86 +945,77 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UG-3EouFEeiu6boZkiJHCA" x="723" y="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_GKZgE4uIEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_GKZgFIuIEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GKZgFouIEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_BRoAkK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BRoAka7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BRoAk67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BRoAkq7nEeq6S5EiV0C3pg" x="140" y="83"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BSp7UK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BSp7Ua7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BSqiYK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_o-AWQBNVEeiKtYjI8wVF7A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKZgFYuIEeiu6boZkiJHCA" x="140" y="-17"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BSp7Uq7nEeq6S5EiV0C3pg" x="140" y="-17"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MaT-8ouIEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MaT-84uIEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaT-9YuIEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_BS1hgK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BS1hga7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BS1hg67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_UbP1gKg5EeeAVfY3jqnvAA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaT-9IuIEeiu6boZkiJHCA" x="140" y="-17"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BS1hgq7nEeq6S5EiV0C3pg" x="140" y="-17"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_QHNHc4uIEeiu6boZkiJHCA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QHNHdIuIEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_QHNugIuIEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_BTAgoK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BTAgoa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BTAgo67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_STzYAO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHNHdYuIEeiu6boZkiJHCA" x="140" y="-17"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTAgoq7nEeq6S5EiV0C3pg" x="140" y="-17"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_JS4dITBDEea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_JS4dIjBDEea4fKwSGMr6CA"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_UBRQoIuFEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
-    </styles>
-    <element xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_EpWpPDBKEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_NPs5UzBDEea4fKwSGMr6CA" target="_EpWpODBKEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_EpWpPTBKEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EpWpQTBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EpWpPjBKEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EpWpPzBKEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EpWpQDBKEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Ep8e_zBKEeaSroGqGbZ6jg" type="StereotypeCommentLink" source="_NP2CRDBDEea4fKwSGMr6CA" target="_Ep8e-zBKEeaSroGqGbZ6jg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Ep8fADBKEeaSroGqGbZ6jg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ep8fBDBKEeaSroGqGbZ6jg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_BTQYQK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BTQYQa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BTQYQ67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ep8fATBKEeaSroGqGbZ6jg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ep8fAjBKEeaSroGqGbZ6jg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ep8fAzBKEeaSroGqGbZ6jg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_9hUkJ1SgEeacRKRpk6W3Lw" type="StereotypeCommentLink" source="_9hBpMFSgEeacRKRpk6W3Lw" target="_9hUkI1SgEeacRKRpk6W3Lw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_9hUkKFSgEeacRKRpk6W3Lw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9hUkLFSgEeacRKRpk6W3Lw" name="BASE_ELEMENT">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTQYQq7nEeq6S5EiV0C3pg" x="724" y="54"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BTm9kK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BTm9ka7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BTm9k67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9hUkKVSgEeacRKRpk6W3Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9hUkKlSgEeacRKRpk6W3Lw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9hUkK1SgEeacRKRpk6W3Lw"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_RnIIF6g5EeeAVfY3jqnvAA" type="StereotypeCommentLink" source="_RnAzUKg5EeeAVfY3jqnvAA" target="_RnIIE6g5EeeAVfY3jqnvAA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_RnIIGKg5EeeAVfY3jqnvAA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_RnIIHKg5EeeAVfY3jqnvAA" name="BASE_ELEMENT">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTm9kq7nEeq6S5EiV0C3pg" x="344" y="367"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BT4qYK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BT4qYa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BT4qY67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RnIIGag5EeeAVfY3jqnvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RnIIGqg5EeeAVfY3jqnvAA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RnIIG6g5EeeAVfY3jqnvAA"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_gCpk1xNVEeiKtYjI8wVF7A" type="StereotypeCommentLink" source="_gCWC0BNVEeiKtYjI8wVF7A" target="_gCpk0xNVEeiKtYjI8wVF7A">
-      <styles xmi:type="notation:FontStyle" xmi:id="_gCpk2BNVEeiKtYjI8wVF7A"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gCpk3BNVEeiKtYjI8wVF7A" name="BASE_ELEMENT">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BT4qYq7nEeq6S5EiV0C3pg" x="723" y="158"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BUP2wK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BUP2wa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BUP2w67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gCpk2RNVEeiKtYjI8wVF7A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCpk2hNVEeiKtYjI8wVF7A"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCpk2xNVEeiKtYjI8wVF7A"/>
-    </edges>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUP2wq7nEeq6S5EiV0C3pg" x="723" y="256"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_JS4dITBDEea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_JS4dIjBDEea4fKwSGMr6CA"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_UBRQoIuFEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_B0fdEK7nEeq6S5EiV0C3pg" name="css_stylesheets" eObjectListValue="_B0YvYK7nEeq6S5EiV0C3pg _CHDMsK7nEeq6S5EiV0C3pg"/>
+    <element xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     <edges xmi:type="notation:Connector" xmi:id="_-Oq_oIuHEeiu6boZkiJHCA" type="Association_Edge" source="_NPs5UzBDEea4fKwSGMr6CA" target="_NPs5UzBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_-OrmsIuHEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="__hcPEIuHEeiu6boZkiJHCA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1144,16 +1096,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9TBEIuIEeiu6boZkiJHCA" id="(1.0,0.9223300970873787)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Iqp2UIuIEeiu6boZkiJHCA" id="(0.0,0.19767441860465115)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_GKZgF4uIEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_GKUnkIuIEeiu6boZkiJHCA" target="_GKZgE4uIEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_GKZgGIuIEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GKZgHIuIEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_o-AWQBNVEeiKtYjI8wVF7A"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GKZgGYuIEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GKZgGouIEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GKZgG4uIEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_MaNRQIuIEeiu6boZkiJHCA" type="Association_Edge" source="_NPs5UzBDEea4fKwSGMr6CA" target="_RnAzUKg5EeeAVfY3jqnvAA">
       <children xmi:type="notation:DecorationNode" xmi:id="_MaN4UIuIEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_MaN4UYuIEeiu6boZkiJHCA" x="-2" y="12"/>
@@ -1178,16 +1120,6 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaNRQouIEeiu6boZkiJHCA" points="[323, 191, -643984, -643984]$[523, 196, -643984, -643984]"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NnPsIIuIEeiu6boZkiJHCA" id="(0.0,0.3793103448275862)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MaT-9ouIEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_MaNRQIuIEeiu6boZkiJHCA" target="_MaT-8ouIEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MaT-94uIEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaT--4uIEeiu6boZkiJHCA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_UbP1gKg5EeeAVfY3jqnvAA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaT--IuIEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaT--YuIEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaT--ouIEeiu6boZkiJHCA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_QHDWcIuIEeiu6boZkiJHCA" type="Association_Edge" source="_NPs5UzBDEea4fKwSGMr6CA" target="_NP2CRDBDEea4fKwSGMr6CA">
       <children xmi:type="notation:DecorationNode" xmi:id="_QHDWc4uIEeiu6boZkiJHCA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_QHD9gIuIEeiu6boZkiJHCA" x="1" y="10"/>
@@ -1212,15 +1144,85 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QHDWcouIEeiu6boZkiJHCA" points="[323, 154, -643984, -643984]$[524, 121, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R6gREIuIEeiu6boZkiJHCA" id="(1.0,0.12135922330097088)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_QHNugYuIEeiu6boZkiJHCA" type="StereotypeCommentLink" source="_QHDWcIuIEeiu6boZkiJHCA" target="_QHNHc4uIEeiu6boZkiJHCA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_QHNugouIEeiu6boZkiJHCA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_QHNuhouIEeiu6boZkiJHCA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_BRoAlK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_NPs5UzBDEea4fKwSGMr6CA" target="_BRoAkK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BRoAla7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BRonoq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BRoAlq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BRonoK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BRonoa7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BSqiYa7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_GKUnkIuIEeiu6boZkiJHCA" target="_BSp7UK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BSqiYq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BSqiZq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_o-AWQBNVEeiKtYjI8wVF7A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BSqiY67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BSqiZK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BSqiZa7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BS1hhK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_MaNRQIuIEeiu6boZkiJHCA" target="_BS1hgK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BS1hha7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BS1hia7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_UbP1gKg5EeeAVfY3jqnvAA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BS1hhq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BS1hh67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BS1hiK7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BTAgpK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_QHDWcIuIEeiu6boZkiJHCA" target="_BTAgoK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BTAgpa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BTBHsq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_STzYAO_tEeWLlrwIF3w0vA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QHNug4uIEeiu6boZkiJHCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QHNuhIuIEeiu6boZkiJHCA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QHNuhYuIEeiu6boZkiJHCA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTAgpq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTBHsK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTBHsa7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BTQYRK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_NP2CRDBDEea4fKwSGMr6CA" target="_BTQYQK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BTQYRa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BTQ_UK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTQYRq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTQYR67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTQYSK7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BTm9lK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_9hBpMFSgEeacRKRpk6W3Lw" target="_BTm9kK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BTm9la7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BTnkoK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_It0sYEG-EeWMO5szP8dKiA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTm9lq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTm9l67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTm9mK7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BT5RcK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_RnAzUKg5EeeAVfY3jqnvAA" target="_BT4qYK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BT5Rca7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BT5Rda7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_7n4UcKg2EeeAVfY3jqnvAA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BT5Rcq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BT5Rc67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BT5RdK7nEeq6S5EiV0C3pg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BUP2xK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_gCWC0BNVEeiKtYjI8wVF7A" target="_BUP2wK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BUP2xa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BUP2ya7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BUP2xq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BUP2x67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BUP2yK7nEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_SFF5oDBDEea4fKwSGMr6CA" type="PapyrusUMLClassDiagram" name="TopologyServiceDetails" measurementUnit="Pixel">
@@ -1769,219 +1771,220 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r05PgUwCEeewALXL7BvPYw" x="172" y="-6" height="88"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MWjUMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MWjUMaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MWjUM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1NTTEK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1NTTEa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1NTTE67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MWjUMqawEeqJcvXkREZ1XQ" x="781" y="-29"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1NTTEq7mEeq6S5EiV0C3pg" x="781" y="-29"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MW8VwKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MW8VwaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MW8Vw6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1Nv_AK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1Nv_Aa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Nv_A67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MW8VwqawEeqJcvXkREZ1XQ" x="781" y="-129"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Nv_Aq7mEeq6S5EiV0C3pg" x="781" y="-129"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MXIjAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MXIjAaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXIjA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1N_2oK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1N_2oa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1N_2o67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW8dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXIjAqawEeqJcvXkREZ1XQ" x="331" y="116"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N_2oq7mEeq6S5EiV0C3pg" x="331" y="116"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MXYaoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MXYaoaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXYao6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1OSxkK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1OSxka7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1OTYoK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXYaoqawEeqJcvXkREZ1XQ" x="920" y="300"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1OSxkq7mEeq6S5EiV0C3pg" x="920" y="300"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYGzYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYGzYaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYGzY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1PMJcK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1PMJca7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PMJc67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYGzYqawEeqJcvXkREZ1XQ" x="920" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PMJcq7mEeq6S5EiV0C3pg" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYLr4KawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYLr4aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYLr46awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1PUFQK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1PUFQa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PUFQ67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYLr4qawEeqJcvXkREZ1XQ" x="920" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PUFQq7mEeq6S5EiV0C3pg" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYSZkKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYSZkaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYSZk6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1PcBEK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1PcBEa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PcBE67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYSZkqawEeqJcvXkREZ1XQ" x="920" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PcBEq7mEeq6S5EiV0C3pg" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYYgMKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYYgMaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYYgM6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1PjV0K7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1PjV0a7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PjV067mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYYgMqawEeqJcvXkREZ1XQ" x="920" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PjV0q7mEeq6S5EiV0C3pg" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYdYsKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYdYsaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYdYs6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1PqqkK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1Pqqka7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Pqqk67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYdYsqawEeqJcvXkREZ1XQ" x="920" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Pqqkq7mEeq6S5EiV0C3pg" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYi4QKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYi4QaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYi4Q6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1PxYQK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1PxYQa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PxYQ67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYi4QqawEeqJcvXkREZ1XQ" x="920" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PxYQq7mEeq6S5EiV0C3pg" x="920" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MYuecKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MYuecaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYuec6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1P8XYK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1P8XYa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1P8XY67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW_dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYuecqawEeqJcvXkREZ1XQ" x="-128" y="-33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1P8XYq7mEeq6S5EiV0C3pg" x="-128" y="-33"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MY9vAKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MY9vAaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MY9vA6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1QKZ0K7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1QKZ0a7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1QKZ067mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXB9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MY9vAqawEeqJcvXkREZ1XQ" x="330" y="211"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1QKZ0q7mEeq6S5EiV0C3pg" x="330" y="211"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MZLKYKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MZLKYaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZLKY6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1QctsK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1Qctsa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Qcts67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MZLKYqawEeqJcvXkREZ1XQ" x="-133" y="106"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Qctsq7mEeq6S5EiV0C3pg" x="-133" y="106"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MZ9NgKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MZ9NgaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZ9Ng6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1RXTsK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1RXTsa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1RXTs67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_CM28EN72EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MZ9NgqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1RXTsq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MaD7MKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MaD7MaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaD7M6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1RgdoK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1Rgdoa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Rgdo67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_rJUvAN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaD7MqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Rgdoq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MaKo4KawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MaKo4aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaKo46awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1RnyYK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1RnyYa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1RoZcK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#__ET2wN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaKo4qawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1RnyYq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MaRWkKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MaRWkaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaRWk6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1RugEK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1RugEa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1RugE67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_WSiGUN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaRWkqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1RugEq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MaYrUKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MaYrUaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaYrU6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1R3C8K7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1R3C8a7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1R3C867mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_cQkyEN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MaYrUqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1R3C8q7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Maex8KawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Maex8aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Maex86awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1R--wK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1R--wa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1R--w67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kZ4bgN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Maex8qawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1R--wq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MalfoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MalfoaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Malfo6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1SFscK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1SFsca7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1SFsc67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_gJx4QN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MalfoqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1SFscq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MasNUKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MasNUaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MasNU6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1SO2YK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1SO2Ya7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1SO2Y67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IZggAN8AEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MasNUqawEeqJcvXkREZ1XQ" x="-133" y="6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1SO2Yq7mEeq6S5EiV0C3pg" x="-133" y="6"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Ma1-U6awEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Ma1-VKawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ma1-VqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1SeuAK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1SeuAa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1SfVEK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXXNyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ma1-VaawEeqJcvXkREZ1XQ" x="-66" y="515"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1SeuAq7mEeq6S5EiV0C3pg" x="-66" y="515"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MbCLkKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MbCLkaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbCLk6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1S0FMK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1S0FMa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1S0FM67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbCLkqawEeqJcvXkREZ1XQ" x="343" y="480"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1S0FMq7mEeq6S5EiV0C3pg" x="343" y="480"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MbXiwKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MbXiwaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbXiw6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1TTNYK7mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1TTNYa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1TTNY67mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXGdyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbXiwqawEeqJcvXkREZ1XQ" x="333" y="318"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1TTNYq7mEeq6S5EiV0C3pg" x="333" y="318"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_MbznoKawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_MbznoaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mbzno6awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1T5qU67mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1T5qVK7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1T6RYK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW99yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbznoqawEeqJcvXkREZ1XQ" x="-131" y="447"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1T5qVa7mEeq6S5EiV0C3pg" x="-131" y="447"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Mb_04KawEeqJcvXkREZ1XQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Mb_04aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mb_046awEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_1UQ2s67mEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1URdwK7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1URdwq7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mb_04qawEeqJcvXkREZ1XQ" x="372" y="-6"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1URdwa7mEeq6S5EiV0C3pg" x="372" y="-6"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_SFF5oTBDEea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_SFF5ojBDEea4fKwSGMr6CA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Sr71YIuFEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_4YL6sK7mEeq6S5EiV0C3pg" name="css_stylesheets" eObjectListValue="_4X-fUK7mEeq6S5EiV0C3pg _417moK7mEeq6S5EiV0C3pg"/>
     <element xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     <edges xmi:type="notation:Connector" xmi:id="_qXQM6kYDEeaB8vMnkFQLXQ" type="StereotypeCommentLink" target="_qXQM5kYDEeaB8vMnkFQLXQ">
       <styles xmi:type="notation:FontStyle" xmi:id="_qXQM60YDEeaB8vMnkFQLXQ"/>
@@ -2403,265 +2406,265 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6U9jIIuHEeiu6boZkiJHCA" id="(0.0,0.6593406593406593)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7VAD0IuHEeiu6boZkiJHCA" id="(1.0,0.43956043956043955)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MWjUNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSX4DBDEea4fKwSGMr6CA" target="_MWjUMKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MWjUNaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MWjUOaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1NTTFK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvSX4DBDEea4fKwSGMr6CA" target="_1NTTEK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1NTTFa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1NTTGa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MWjUNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MWjUN6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MWjUOKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1NTTFq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1NTTF67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1NTTGK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MW8VxKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_G_CegIuHEeiu6boZkiJHCA" target="_MW8VwKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MW8VxaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MW8VyaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1Nv_BK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_G_CegIuHEeiu6boZkiJHCA" target="_1Nv_AK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1Nv_Ba7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Nv_Ca7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MW8VxqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MW8Vx6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MW8VyKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Nv_Bq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Nv_B67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Nv_CK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MXIjBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSYxjBDEea4fKwSGMr6CA" target="_MXIjAKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MXIjBaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXIjCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1OAdsK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvSYxjBDEea4fKwSGMr6CA" target="_1N_2oK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1OAdsa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1OAdta7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW8dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MXIjBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXIjB6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXIjCKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1OAdsq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1OAds67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1OAdtK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MXYapKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSZKTBDEea4fKwSGMr6CA" target="_MXYaoKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MXYapaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MXZBsqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1OTYoa7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvSZKTBDEea4fKwSGMr6CA" target="_1OSxkK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1OTYoq7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1OT_sK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MXYapqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXZBsKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MXZBsaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1OTYo67mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1OTYpK7mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1OTYpa7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYGzZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_JpiV4IuHEeiu6boZkiJHCA" target="_MYGzYKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYGzZaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYGzaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1PMJdK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_JpiV4IuHEeiu6boZkiJHCA" target="_1PMJcK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1PMJda7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PMJea7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYGzZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYGzZ6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYGzaKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PMJdq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PMJd67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PMJeK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYMS8KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_jltkAIuHEeiu6boZkiJHCA" target="_MYLr4KawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYMS8aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYMS9aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1PUFRK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_jltkAIuHEeiu6boZkiJHCA" target="_1PUFQK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1PUFRa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PUFSa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_tOFAkN7rEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYMS8qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYMS86awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYMS9KawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PUFRq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PUFR67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PUFSK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYSZlKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_tDE2UIuHEeiu6boZkiJHCA" target="_MYSZkKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYSZlaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYSZmaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1PcBFK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_tDE2UIuHEeiu6boZkiJHCA" target="_1PcBEK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1PcBFa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PcoIq7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_7DdfMN7vEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYSZlqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYSZl6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYSZmKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PcBFq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PcoIK7mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PcoIa7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYYgNKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_wlHZsIuHEeiu6boZkiJHCA" target="_MYYgMKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYYgNaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYYgOaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1PjV1K7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_wlHZsIuHEeiu6boZkiJHCA" target="_1PjV0K7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1PjV1a7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PjV2a7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kTBiYN7xEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYYgNqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYYgN6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYYgOKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PjV1q7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PjV167mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PjV2K7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYd_wKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_2A9XUIuHEeiu6boZkiJHCA" target="_MYdYsKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYd_waawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYd_xaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1PqqlK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_2A9XUIuHEeiu6boZkiJHCA" target="_1PqqkK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1Pqqla7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Pqqma7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_lqLYAN7wEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYd_wqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYd_w6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYd_xKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Pqqlq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Pqql67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PqqmK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYi4RKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_5Y3HQIuHEeiu6boZkiJHCA" target="_MYi4QKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYi4RaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYjfUqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1PxYRK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_5Y3HQIuHEeiu6boZkiJHCA" target="_1PxYQK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1PxYRa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1PxYSa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_W9zh0N7-EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYi4RqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYjfUKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYjfUaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PxYRq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PxYR67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1PxYSK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MYuedKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvSaojBDEea4fKwSGMr6CA" target="_MYuecKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MYuedaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MYueeaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1P8XZK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvSaojBDEea4fKwSGMr6CA" target="_1P8XYK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1P8XZa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1P8Xaa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW_dyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MYuedqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYued6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MYueeKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1P8XZq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1P8XZ67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1P8XaK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MY9vBKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_Wvbh0DBDEea4fKwSGMr6CA" target="_MY9vAKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MY9vBaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MY9vCaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1QLA4K7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_Wvbh0DBDEea4fKwSGMr6CA" target="_1QKZ0K7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1QLA4a7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1QLA5a7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXB9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MY9vBqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MY9vB6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MY9vCKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1QLA4q7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QLA467mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QLA5K7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MZLKZKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvbikTBDEea4fKwSGMr6CA" target="_MZLKYKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MZLKZaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZLKaaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1QdUwK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvbikTBDEea4fKwSGMr6CA" target="_1QctsK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1QdUwa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1QdUxa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MZLKZqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZLKZ6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZLKaKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1QdUwq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QdUw67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QdUxK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MZ9NhKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_7c87YIuGEeiu6boZkiJHCA" target="_MZ9NgKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MZ9NhaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MZ9NiaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1RXTtK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_7c87YIuGEeiu6boZkiJHCA" target="_1RXTsK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1RXTta7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1RXTua7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_CM28EN72EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MZ9NhqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZ9Nh6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZ9NiKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1RXTtq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RXTt67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RXTuK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MaD7NKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="__ZY7wIuGEeiu6boZkiJHCA" target="_MaD7MKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MaD7NaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaD7OaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1RgdpK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="__ZY7wIuGEeiu6boZkiJHCA" target="_1RgdoK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1Rgdpa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Rgdqa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_rJUvAN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaD7NqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaD7N6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaD7OKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Rgdpq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Rgdp67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RgdqK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MaKo5KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_CtslIIuHEeiu6boZkiJHCA" target="_MaKo4KawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MaKo5aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaKo6aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1RoZca7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_CtslIIuHEeiu6boZkiJHCA" target="_1RnyYK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1RoZcq7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1RoZdq7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#__ET2wN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaKo5qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaKo56awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaKo6KawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1RoZc67mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RoZdK7mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RoZda7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MaRWlKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_OkjeYIuHEeiu6boZkiJHCA" target="_MaRWkKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MaRWlaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaRWmaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1RugFK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_OkjeYIuHEeiu6boZkiJHCA" target="_1RugEK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1RugFa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1RugGa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_WSiGUN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaRWlqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaRWl6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaRWmKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1RugFq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RugF67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1RugGK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MaYrVKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_RNDKoIuHEeiu6boZkiJHCA" target="_MaYrUKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MaYrVaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MaYrWaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1R3C9K7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_RNDKoIuHEeiu6boZkiJHCA" target="_1R3C8K7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1R3C9a7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1R3C-a7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_cQkyEN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MaYrVqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaYrV6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaYrWKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1R3C9q7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1R3C967mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1R3C-K7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Maex9KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_ZCnYsIuHEeiu6boZkiJHCA" target="_Maex8KawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Maex9aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Maex-aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1R--xK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_ZCnYsIuHEeiu6boZkiJHCA" target="_1R--wK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1R--xa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1R_l0K7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_kZ4bgN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Maex9qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Maex96awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Maex-KawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1R--xq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1R--x67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1R--yK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MalfpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_b4wfYIuHEeiu6boZkiJHCA" target="_MalfoKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MalfpaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MalfqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1SGTgK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_b4wfYIuHEeiu6boZkiJHCA" target="_1SFscK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1SGTga7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1SGTha7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_gJx4QN71EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MalfpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Malfp6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MalfqKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1SGTgq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1SGTg67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1SGThK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MasNVKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_e2FMIIuHEeiu6boZkiJHCA" target="_MasNUKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MasNVaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MasNWaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1SO2ZK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_e2FMIIuHEeiu6boZkiJHCA" target="_1SO2YK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1SO2Za7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1SO2aa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IZggAN8AEeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MasNVqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MasNV6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MasNWKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1SO2Zq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1SO2Z67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1SO2aK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Ma1-V6awEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvblRTBDEea4fKwSGMr6CA" target="_Ma1-U6awEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Ma1-WKawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ma2lYqawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1SfVEa7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvblRTBDEea4fKwSGMr6CA" target="_1SeuAK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1SfVEq7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1SfVFq7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXXNyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ma1-WaawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ma2lYKawEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ma2lYaawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1SfVE67mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1SfVFK7mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1SfVFa7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MbCLlKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvlS0DBDEea4fKwSGMr6CA" target="_MbCLkKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MbCLlaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbCLmaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1S0FNK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvlS0DBDEea4fKwSGMr6CA" target="_1S0FMK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1S0FNa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1S0sQK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_j2GU0N78EeW-BtRsuJPbqg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbCLlqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbCLl6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbCLmKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1S0FNq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1S0FN67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1S0FOK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MbXixKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvlTcTBDEea4fKwSGMr6CA" target="_MbXiwKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MbXixaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbXiyaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1TTNZK7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvlTcTBDEea4fKwSGMr6CA" target="_1TTNYK7mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1TTNZa7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1TTNaa7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZXGdyKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbXixqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbXix6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbXiyKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1TTNZq7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1TTNZ67mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1TTNaK7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MbznpKawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_WvlUkzBDEea4fKwSGMr6CA" target="_MbznoKawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_MbznpaawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbznqaawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1T6RYa7mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_WvlUkzBDEea4fKwSGMr6CA" target="_1T5qU67mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1T6RYq7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1T6RZq7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_KjZW99yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbznpqawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mbznp6awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbznqKawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1T6RY67mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1T6RZK7mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1T6RZa7mEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Mb_05KawEeqJcvXkREZ1XQ" type="StereotypeCommentLink" source="_r05PgEwCEeewALXL7BvPYw" target="_Mb_04KawEeqJcvXkREZ1XQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Mb_05aawEeqJcvXkREZ1XQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mb_06aawEeqJcvXkREZ1XQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_1URdw67mEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_r05PgEwCEeewALXL7BvPYw" target="_1UQ2s67mEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1URdxK7mEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1URdyK7mEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_KjZXM9yKEeWXdJnxZxtFYA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Mb_05qawEeqJcvXkREZ1XQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mb_056awEeqJcvXkREZ1XQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mb_06KawEeqJcvXkREZ1XQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1URdxa7mEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1URdxq7mEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1URdx67mEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_d6faUDBDEea4fKwSGMr6CA" type="PapyrusUMLClassDiagram" name="TopologyServiceSkeleton" measurementUnit="Pixel">
@@ -2940,139 +2943,140 @@
       <element xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9gpoRM3Eee0L_IMWjydgQ" x="412" y="-206" width="213" height="71"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2RojEG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2RojEW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2RojE29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FsjTwK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FsjTwa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FsjTw67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RojEm9aEeq3NYg-TXSAxQ" x="418" y="-26"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FsjTwq7nEeq6S5EiV0C3pg" x="418" y="-26"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2Rwe4G9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2Rwe4W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2Rwe429aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FsqBcK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FsqBca7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FsqBc67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Rwe4m9aEeq3NYg-TXSAxQ" x="418" y="-126"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FsqBcq7nEeq6S5EiV0C3pg" x="418" y="-126"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2R5o0G9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2R5o0W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2R5o029aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Fsx9QK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Fsx9Qa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fsx9Q67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2R5o0m9aEeq3NYg-TXSAxQ" x="418" y="-126"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fsx9Qq7nEeq6S5EiV0C3pg" x="418" y="-126"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2SFPA29aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2SFPBG9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SF2EG9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Fs8VU67nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Fs8VVK7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fs88YK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiTopology.uml#_-ht5oPMtEeSb-q8_djA2ng"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2SFPBW9aEeq3NYg-TXSAxQ" x="60" y="88"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fs8VVa7nEeq6S5EiV0C3pg" x="60" y="88"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2SPnEG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2SPnEW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SPnE29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FtHUcK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FtHUca7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FtH7gK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2SPnEm9aEeq3NYg-TXSAxQ" x="698" y="342"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtHUcq7nEeq6S5EiV0C3pg" x="698" y="342"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2SfesG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2SfesW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2Sfes29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FtVW4K7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FtVW4a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FtVW467nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Sfesm9aEeq3NYg-TXSAxQ" x="568" y="158"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtVW4q7nEeq6S5EiV0C3pg" x="568" y="158"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2SllUG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2SllUW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SmMYG9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FtbdgK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ftbdga7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ftbdg67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2SllUm9aEeq3NYg-TXSAxQ" x="568" y="58"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ftbdgq7nEeq6S5EiV0C3pg" x="568" y="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2SvWUG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2SvWUW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SvWU29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FtmcoK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ftmcoa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ftmco67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2SvWUm9aEeq3NYg-TXSAxQ" x="568" y="58"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ftmcoq7nEeq6S5EiV0C3pg" x="568" y="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2S8xsG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2S8xsW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2S8xs29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FtxbwK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ftxbwa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ftxbw67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2S8xsm9aEeq3NYg-TXSAxQ" x="396" y="338"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ftxbwq7nEeq6S5EiV0C3pg" x="396" y="338"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2TOegG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2TOegW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2TOeg29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Ft-3IK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ft-3Ia7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ft-3I67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_oCmjAETtEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TOegm9aEeq3NYg-TXSAxQ" x="57" y="-20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ft-3Iq7nEeq6S5EiV0C3pg" x="57" y="-20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2TXBYG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2TXocG9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2TXocm9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FuE9wK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FuE9wa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuFk0K7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_v4NNUETtEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TXocW9aEeq3NYg-TXSAxQ" x="57" y="-120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FuE9wq7nEeq6S5EiV0C3pg" x="57" y="-120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2TmR8G9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2TmR8W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2Tm5AG9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FuRLAK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FuRLAa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuRLA67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TmR8m9aEeq3NYg-TXSAxQ" x="119" y="-214"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FuRLAq7nEeq6S5EiV0C3pg" x="119" y="-214"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2TwqAG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2TwqAW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2TwqA29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FuXRoK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FuXRoa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuX4sK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TwqAm9aEeq3NYg-TXSAxQ" x="119" y="-314"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FuXRoq7nEeq6S5EiV0C3pg" x="119" y="-314"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2T5z8G9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2T5z8W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2T5z829aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FucxMK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FucxMa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FucxM67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_SoY-cMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2T5z8m9aEeq3NYg-TXSAxQ" x="119" y="-314"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FucxMq7nEeq6S5EiV0C3pg" x="119" y="-314"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2UBvwG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2UBvwW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2UBvw29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FukF8K7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FukF8a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FukF867nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2UBvwm9aEeq3NYg-TXSAxQ" x="119" y="-314"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FukF8q7nEeq6S5EiV0C3pg" x="119" y="-314"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2USOcG9aEeq3NYg-TXSAxQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2USOcW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2USOc29aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_FuxhU67nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FuxhVK7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuyIYK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2USOcm9aEeq3NYg-TXSAxQ" x="612" y="-206"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FuxhVa7nEeq6S5EiV0C3pg" x="612" y="-206"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_d6faUTBDEea4fKwSGMr6CA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_d6faUjBDEea4fKwSGMr6CA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Rxke4IuFEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_GVb4sK7nEeq6S5EiV0C3pg" name="css_stylesheets" eObjectListValue="_GVXAMK7nEeq6S5EiV0C3pg _GsBzwK7nEeq6S5EiV0C3pg"/>
     <element xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     <edges xmi:type="notation:Connector" xmi:id="_Q92vR8hmEeaVlemTikmRHw" type="StereotypeCommentLink" target="_Q92vQ8hmEeaVlemTikmRHw">
       <styles xmi:type="notation:FontStyle" xmi:id="_Q92vSMhmEeaVlemTikmRHw"/>
@@ -3379,165 +3383,165 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jhg18IuGEeiu6boZkiJHCA" id="(0.948051948051948,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jhg18YuGEeiu6boZkiJHCA" id="(0.14935064935064934,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2RpKIG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_i9BgRjBDEea4fKwSGMr6CA" target="_2RojEG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2RpKIW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2RpKJW9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FsjTxK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_i9BgRjBDEea4fKwSGMr6CA" target="_FsjTwK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FsjTxa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FsjTya7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_ejyEgOKyEeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2RpKIm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2RpKI29aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2RpKJG9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FsjTxq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsjTx67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsjTyK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2RxF8G9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_GdOAUIuGEeiu6boZkiJHCA" target="_2Rwe4G9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2RxF8W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2RxF9W9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FsqBdK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_GdOAUIuGEeiu6boZkiJHCA" target="_FsqBcK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FsqBda7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fsqogq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_GkchcD_DEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2RxF8m9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2RxF829aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2RxF9G9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FsqBdq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsqogK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fsqoga7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2R5o1G9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_KCgE8IuGEeiu6boZkiJHCA" target="_2R5o0G9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2R5o1W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2R5o2W9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Fsx9RK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_KCgE8IuGEeiu6boZkiJHCA" target="_Fsx9QK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fsx9Ra7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FsykUK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_9-A9gD_KEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2R5o1m9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2R5o129aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2R5o2G9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fsx9Rq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fsx9R67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fsx9SK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2SF2EW9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_i9BgkzBDEea4fKwSGMr6CA" target="_2SFPA29aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2SF2Em9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SF2Fm9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Fs88Ya7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_i9BgkzBDEea4fKwSGMr6CA" target="_Fs8VU67nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fs88Yq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fs88Zq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TapiTopology.uml#_-ht5oPMtEeSb-q8_djA2ng"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2SF2E29aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SF2FG9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SF2FW9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fs88Y67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fs88ZK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fs88Za7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2SPnFG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_i9LREDBDEea4fKwSGMr6CA" target="_2SPnEG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2SQOIG9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SQOJG9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FtH7ga7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_i9LREDBDEea4fKwSGMr6CA" target="_FtHUcK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FtH7gq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FtH7hq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2SQOIW9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SQOIm9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SQOI29aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FtH7g67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtH7hK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtH7ha7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2SfetG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_i9LRtzBDEea4fKwSGMr6CA" target="_2SfesG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2SfetW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SgFwm9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FtVW5K7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_i9LRtzBDEea4fKwSGMr6CA" target="_FtVW4K7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FtVW5a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FtVW6a7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Sfetm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SgFwG9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SgFwW9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FtVW5q7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtVW567nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtVW6K7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2SmMYW9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_N4TR0IuGEeiu6boZkiJHCA" target="_2SllUG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2SmMYm9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SmMZm9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FtbdhK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_N4TR0IuGEeiu6boZkiJHCA" target="_FtbdgK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ftbdha7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ftbdia7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_T7gvkD_LEeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2SmMY29aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SmMZG9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SmMZW9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ftbdhq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ftbdh67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtbdiK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2SvWVG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_aE_4MIuGEeiu6boZkiJHCA" target="_2SvWUG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2SvWVW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2SvWWW9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FtmcpK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_aE_4MIuGEeiu6boZkiJHCA" target="_FtmcoK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ftmcpa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ftmcqa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2SvWVm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SvWV29aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2SvWWG9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ftmcpq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ftmcp67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtmcqK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2S8xtG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_i9LSWTBDEea4fKwSGMr6CA" target="_2S8xsG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2S8xtW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2S8xuW9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FtxbxK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_i9LSWTBDEea4fKwSGMr6CA" target="_FtxbwK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ftxbxa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ftxbya7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_37fFQOMCEeSdZOEXoN8VDQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2S8xtm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2S8xt29aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2S8xuG9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ftxbxq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ftxbx67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FtxbyK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2TOehG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_q5U4gETtEead1bezhJG4aw" target="_2TOegG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2TOehW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2TOeiW9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Ft-3JK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_q5U4gETtEead1bezhJG4aw" target="_Ft-3IK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ft-3Ja7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ft-3Ka7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_oCmjAETtEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2TOehm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TOeh29aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TOeiG9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ft-3Jq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ft-3J67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ft-3KK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2TXoc29aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_At2pwIuGEeiu6boZkiJHCA" target="_2TXBYG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2TXodG9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2TXoeG9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FuFk0a7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_At2pwIuGEeiu6boZkiJHCA" target="_FuE9wK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FuFk0q7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuFk1q7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_v4NNUETtEead1bezhJG4aw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2TXodW9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TXodm9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TXod29aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FuFk067nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuFk1K7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuFk1a7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2Tm5AW9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_PTdqAshmEeaVlemTikmRHw" target="_2TmR8G9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2Tm5Am9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2Tm5Bm9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FuRyEK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_PTdqAshmEeaVlemTikmRHw" target="_FuRLAK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FuRyEa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuRyFa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_PSCGoMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Tm5A29aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Tm5BG9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Tm5BW9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FuRyEq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuRyE67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuRyFK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2TwqBG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_tkf-cBM3Eee0L_IMWjydgQ" target="_2TwqAG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2TwqBW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2TwqCW9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FuX4sa7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_tkf-cBM3Eee0L_IMWjydgQ" target="_FuXRoK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FuX4sq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuX4tq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Abstraction" href="TapiTopology.uml#_ti-UcBM3Eee0L_IMWjydgQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2TwqBm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TwqB29aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TwqCG9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FuX4s67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuX4tK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuX4ta7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2T5z9G9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_4NSW4IuFEeiu6boZkiJHCA" target="_2T5z8G9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2T5z9W9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2T5z-W9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FucxNK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_4NSW4IuFEeiu6boZkiJHCA" target="_FucxMK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FucxNa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FucxOa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_SoY-cMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2T5z9m9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2T5z929aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2T5z-G9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FucxNq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FucxN67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FucxOK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2UBvxG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_7PbSMIuFEeiu6boZkiJHCA" target="_2UBvwG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2UBvxW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2UCW0m9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FukF9K7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_7PbSMIuFEeiu6boZkiJHCA" target="_FukF8K7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FukF9a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FukF-a7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_3TemUMhmEeaVlemTikmRHw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2UBvxm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2UCW0G9aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2UCW0W9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FukF9q7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FukF967nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FukF-K7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2USOdG9aEeq3NYg-TXSAxQ" type="StereotypeCommentLink" source="_p9gpoBM3Eee0L_IMWjydgQ" target="_2USOcG9aEeq3NYg-TXSAxQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2USOdW9aEeq3NYg-TXSAxQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2USOeW9aEeq3NYg-TXSAxQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_FuyIYa7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_p9gpoBM3Eee0L_IMWjydgQ" target="_FuxhU67nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FuyIYq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FuyIZq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiCommon.uml#_sfccMOK0EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2USOdm9aEeq3NYg-TXSAxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2USOd29aEeq3NYg-TXSAxQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2USOeG9aEeq3NYg-TXSAxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FuyIY67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuyIZK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FuyIZa7nEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_vy9qUBk7EeeV4o0osG5stg" type="PapyrusUMLClassDiagram" name="NodeConstraints" measurementUnit="Pixel">
@@ -4071,91 +4075,92 @@
       <element xmi:type="uml:Enumeration" href="TapiCommon.uml#_dLDeINnjEeWIOYiRCk5bbQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LZTQoW9sEeq3NYg-TXSAxQ" x="400" y="640" width="221" height="121"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4ArJAIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4ArJAYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4ArJA4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D1-MoK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D1-Moa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D1-Mo67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xDuuoBk7EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ArJAoZqEeqZobVcFzbEhg" x="560" y="120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1-Moq7nEeq6S5EiV0C3pg" x="560" y="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4H4kQIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4H4kQYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4H5LUIZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D2bfoK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D2bfoa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D2cGsK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_Qw4ncBk9EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4H4kQoZqEeqZobVcFzbEhg" x="560" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D2bfoq7nEeq6S5EiV0C3pg" x="560" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4JUusIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4JUusYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4JVVwIZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D2nF0K7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D2nF0a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D2nF067nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_li1MYBk9EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JUusoZqEeqZobVcFzbEhg" x="560" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D2nF0q7nEeq6S5EiV0C3pg" x="560" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4LQoYIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4LQoYYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4LQoY4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D2wPwK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D2wPwa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D2wPw67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LQoYoZqEeqZobVcFzbEhg" x="300" y="199"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D2wPwq7nEeq6S5EiV0C3pg" x="300" y="199"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4MYpwIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4MYpwYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4MYpw4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D2718K7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D2718a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D271867nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4MYpwoZqEeqZobVcFzbEhg" x="300" y="-31"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D2718q7nEeq6S5EiV0C3pg" x="300" y="-31"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4NF0YIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4NF0YYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4NF0Y4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D3E_4K7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3E_4a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3E_467nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NF0YoZqEeqZobVcFzbEhg" x="300" y="-131"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3E_4q7nEeq6S5EiV0C3pg" x="300" y="-131"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4NbLkIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4NbLkYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4NbLk4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D3J4YK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3J4Ya7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3J4Y67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_u4xdgBk8EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NbLkoZqEeqZobVcFzbEhg" x="300" y="-131"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3J4Yq7nEeq6S5EiV0C3pg" x="300" y="-131"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4PN7UIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4PN7UYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4PN7U4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D3TpY67nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3TpZK7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3UQcK7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_9W0Q4Bk7EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4PN7UoZqEeqZobVcFzbEhg" x="980" y="120"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3TpZa7nEeq6S5EiV0C3pg" x="980" y="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4RWCQIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4RWCQYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4RWCQ4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D3zYoK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3zYoa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3zYo67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_zPz88BlBEeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RWCQoZqEeqZobVcFzbEhg" x="980" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3zYoq7nEeq6S5EiV0C3pg" x="980" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_4R-UYIZqEeqZobVcFzbEhg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4R-UYYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4R-UY4ZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_D38ikK7nEeq6S5EiV0C3pg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D38ika7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D38ik67nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_JCwTkBk8EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4R-UYoZqEeqZobVcFzbEhg" x="680" y="420"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D38ikq7nEeq6S5EiV0C3pg" x="680" y="420"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_vy9qURk7EeeV4o0osG5stg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_vy9qUhk7EeeV4o0osG5stg"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Uo8UoIuFEeiu6boZkiJHCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_EbSgMK7nEeq6S5EiV0C3pg" name="css_stylesheets" eObjectListValue="_EbNnsK7nEeq6S5EiV0C3pg _E19qAK7nEeq6S5EiV0C3pg"/>
     <element xmi:type="uml:Package" href="TapiTopology.uml#_SXc0sC5xEea0_JngOlSKcA"/>
     <edges xmi:type="notation:Connector" xmi:id="_QxRB8Bk9EeeV4o0osG5stg" type="Association_Edge" source="_xHZGoBk7EeeV4o0osG5stg" target="_9W6XgBk7EeeV4o0osG5stg">
       <children xmi:type="notation:DecorationNode" xmi:id="_QxRB8xk9EeeV4o0osG5stg" type="Association_StereotypeLabel">
@@ -4436,106 +4441,116 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9YDEMIuIEeiu6boZkiJHCA" id="(0.6896551724137931,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6yxrEIuIEeiu6boZkiJHCA" id="(0.1360544217687075,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4AsXIIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_xHZGoBk7EeeV4o0osG5stg" target="_4ArJAIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4AsXIYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4As-MIZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D1-MpK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_xHZGoBk7EeeV4o0osG5stg" target="_D1-MoK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D1-Mpa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D1-Mqa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xDuuoBk7EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4AsXIoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4AsXI4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4AsXJIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D1-Mpq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1-Mp67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1-MqK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4H5yYIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_QxRB8Bk9EeeV4o0osG5stg" target="_4H4kQIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4H5yYYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4H5yZYZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D2cGsa7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_QxRB8Bk9EeeV4o0osG5stg" target="_D2bfoK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D2cGsq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D2cGtq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_Qw4ncBk9EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4H5yYoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4H5yY4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4H5yZIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D2cGs67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D2cGtK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D2cGta7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4JVVwYZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_52OjQIuIEeiu6boZkiJHCA" target="_4JUusIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4JVVwoZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4JV80oZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D2nF1K7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_52OjQIuIEeiu6boZkiJHCA" target="_D2nF0K7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D2nF1a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D2nF2a7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_li1MYBk9EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4JVVw4ZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JV80IZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JV80YZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D2nF1q7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D2nF167nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D2nF2K7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4LQoZIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_1uyIgBk7EeeV4o0osG5stg" target="_4LQoYIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4LQoZYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4LRPcIZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D2wPxK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_1uyIgBk7EeeV4o0osG5stg" target="_D2wPwK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D2wPxa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D2wPya7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4LQoZoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4LQoZ4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4LQoaIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D2wPxq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D2wPx67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D2wPyK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4MYpxIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_4nWREBk7EeeV4o0osG5stg" target="_4MYpwIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4MYpxYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4MZQ0IZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D28dAK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_4nWREBk7EeeV4o0osG5stg" target="_D2718K7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D28dAa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D28dBa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_xImb0OK4EeSq5fATALSQkQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4MYpxoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4MYpx4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4MYpyIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D28dAq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D28dA67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D28dBK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4NF0ZIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_YBQM4IuIEeiu6boZkiJHCA" target="_4NF0YIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4NF0ZYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4NF0aYZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D3E_5K7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_YBQM4IuIEeiu6boZkiJHCA" target="_D3E_4K7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D3E_5a7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3E_6a7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_IzuHYKf4EeW6jfwWQNiYcg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4NF0ZoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4NF0Z4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4NF0aIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D3E_5q7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3E_567nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3E_6K7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4NbyoIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_cmCmsIuIEeiu6boZkiJHCA" target="_4NbLkIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4NbyoYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4NbypYZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D3J4ZK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_cmCmsIuIEeiu6boZkiJHCA" target="_D3J4YK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D3J4Za7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3J4aa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_u4xdgBk8EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4NbyooZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Nbyo4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4NbypIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D3J4Zq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3J4Z67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3J4aK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4PN7VIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_9W6XgBk7EeeV4o0osG5stg" target="_4PN7UIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4PN7VYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4POiYoZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D3UQca7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_9W6XgBk7EeeV4o0osG5stg" target="_D3TpY67nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D3UQcq7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3UQdq7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_9W0Q4Bk7EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4PN7VoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4POiYIZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4POiYYZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D3UQc67nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3UQdK7nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3UQda7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4RWCRIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_2s8eIIuIEeiu6boZkiJHCA" target="_4RWCQIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4RWCRYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4RWpUoZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D3zYpK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_2s8eIIuIEeiu6boZkiJHCA" target="_D3zYoK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D3zYpa7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D3zYqa7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Association" href="TapiTopology.uml#_zPz88BlBEeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4RWCRoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4RWpUIZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4RWpUYZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D3zYpq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3zYp67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D3zYqK7nEeq6S5EiV0C3pg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4R-UZIZqEeqZobVcFzbEhg" type="StereotypeCommentLink" source="_JC2aMBk8EeeV4o0osG5stg" target="_4R-UYIZqEeqZobVcFzbEhg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_4R-UZYZqEeqZobVcFzbEhg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4R-UaYZqEeqZobVcFzbEhg" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_D38ilK7nEeq6S5EiV0C3pg" type="StereotypeCommentLink" source="_JC2aMBk8EeeV4o0osG5stg" target="_D38ikK7nEeq6S5EiV0C3pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_D38ila7nEeq6S5EiV0C3pg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_D38ima7nEeq6S5EiV0C3pg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="TapiTopology.uml#_JCwTkBk8EeeV4o0osG5stg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4R-UZoZqEeqZobVcFzbEhg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4R-UZ4ZqEeqZobVcFzbEhg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4R-UaIZqEeqZobVcFzbEhg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D38ilq7nEeq6S5EiV0C3pg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D38il67nEeq6S5EiV0C3pg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D38imK7nEeq6S5EiV0C3pg"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_-TQ04KGnEeqPrpdMOOTlbQ"/>
+  <css:StyleSheetReference xmi:id="_4X-fUK7mEeq6S5EiV0C3pg" path="/TAPI/UML/TapiClassDiagram.css"/>
+  <css:StyleSheetReference xmi:id="_417moK7mEeq6S5EiV0C3pg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  <css:StyleSheetReference xmi:id="__4ki8K7mEeq6S5EiV0C3pg" path="/TAPI/UML/TapiClassDiagram.css"/>
+  <css:StyleSheetReference xmi:id="_ARL3QK7nEeq6S5EiV0C3pg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  <css:StyleSheetReference xmi:id="_B0YvYK7nEeq6S5EiV0C3pg" path="/TAPI/UML/TapiClassDiagram.css"/>
+  <css:StyleSheetReference xmi:id="_CHDMsK7nEeq6S5EiV0C3pg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  <css:StyleSheetReference xmi:id="_EbNnsK7nEeq6S5EiV0C3pg" path="/TAPI/UML/TapiClassDiagram.css"/>
+  <css:StyleSheetReference xmi:id="_E19qAK7nEeq6S5EiV0C3pg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
+  <css:StyleSheetReference xmi:id="_GVXAMK7nEeq6S5EiV0C3pg" path="/TAPI/UML/TapiClassDiagram.css"/>
+  <css:StyleSheetReference xmi:id="_GsBzwK7nEeq6S5EiV0C3pg" path="/TAPI/UML/UmlProfiles/ClassDiagramStyleSheet.css"/>
 </xmi:XMI>
diff --git a/YANG/tapi-connectivity@2020-04-23.tree b/YANG/tapi-connectivity@2020-06-16.tree
similarity index 100%
rename from YANG/tapi-connectivity@2020-04-23.tree
rename to YANG/tapi-connectivity@2020-06-16.tree
diff --git a/YANG/tapi-connectivity@2020-04-23.yang b/YANG/tapi-connectivity@2020-06-16.yang
similarity index 97%
rename from YANG/tapi-connectivity@2020-04-23.yang
rename to YANG/tapi-connectivity@2020-06-16.yang
index 0cdc187f..2dda9233 100644
--- a/YANG/tapi-connectivity@2020-04-23.yang
+++ b/YANG/tapi-connectivity@2020-06-16.yang
@@ -33,7 +33,7 @@ module tapi-connectivity {
         YANG models included in this release may not be backward compatible with previous TAPI releases.
         Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.
         License: This module is distributed under the Apache License 2.0.";
-    revision 2020-04-23 {
+    revision 2020-06-16 {
         description "ONF Transport API version 2.1.3.
                    - Minor corrections in comments.
                    Changes included in this TAPI release (v2.1.3) are listed in
diff --git a/YANG/tapi-notification@2020-04-23.tree b/YANG/tapi-notification@2020-06-16.tree
similarity index 100%
rename from YANG/tapi-notification@2020-04-23.tree
rename to YANG/tapi-notification@2020-06-16.tree
diff --git a/YANG/tapi-notification@2020-04-23.yang b/YANG/tapi-notification@2020-06-16.yang
similarity index 97%
rename from YANG/tapi-notification@2020-04-23.yang
rename to YANG/tapi-notification@2020-06-16.yang
index 762f924b..058692f6 100644
--- a/YANG/tapi-notification@2020-04-23.yang
+++ b/YANG/tapi-notification@2020-06-16.yang
@@ -27,7 +27,7 @@ module tapi-notification {
           YANG models included in this release may not be backward compatible with previous TAPI releases.
         Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.
         License: This module is distributed under the Apache License 2.0";
-    revision 2020-04-23 {
+    revision 2020-06-16 {
         description "ONF Transport API version 2.1.3.
                    - Added DEVICE to ObjectType.
                    Changes included in this TAPI release (v2.1.3) are listed in
diff --git a/YANG/tapi-photonic-media@2020-04-23.tree b/YANG/tapi-photonic-media@2020-06-16.tree
similarity index 70%
rename from YANG/tapi-photonic-media@2020-04-23.tree
rename to YANG/tapi-photonic-media@2020-06-16.tree
index e4dc3769..fdb1403e 100644
--- a/YANG/tapi-photonic-media@2020-04-23.tree
+++ b/YANG/tapi-photonic-media@2020-06-16.tree
@@ -64,20 +64,16 @@ module: tapi-photonic-media
   augment /tapi-common:context/tapi-common:service-interface-point:
     +--rw otsi-service-interface-point-spec
        +--ro otsi-capability
-       |  +--ro supportable-lower-central-frequency* [central-frequency]
+       |  +--ro supportable-central-frequency-spectrum-band* [lower-central-frequency upper-central-frequency]
+       |  |  +--ro lower-central-frequency    uint64
+       |  |  +--ro upper-central-frequency    uint64
        |  |  +--ro frequency-constraint
-       |  |  |  +--ro adjustment-granularity?   adjustment-granularity
-       |  |  |  +--ro grid-type?                grid-type
-       |  |  +--ro central-frequency       uint64
-       |  +--ro supportable-upper-central-frequency* [central-frequency]
-       |  |  +--ro frequency-constraint
-       |  |  |  +--ro adjustment-granularity?   adjustment-granularity
-       |  |  |  +--ro grid-type?                grid-type
-       |  |  +--ro central-frequency       uint64
+       |  |     +--ro adjustment-granularity?   adjustment-granularity
+       |  |     +--ro grid-type?                grid-type
        |  +--ro supportable-application-identifier* [application-code]
        |  |  +--ro application-identifier-type?   application-identifier-type
        |  |  +--ro application-code               string
-       |  +--ro supportable-modulation*                modulation-technique
+       |  +--ro supportable-modulation*                        modulation-technique
        |  +--ro total-power-warn-threshold
        |     +--ro total-power-upper-warn-threshold-default?   decimal64
        |     +--ro total-power-upper-warn-threshold-min?       decimal64
@@ -163,42 +159,29 @@ module: tapi-photonic-media
   augment /tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point:
     +--rw media-channel-connectivity-service-end-point-spec
        +--rw mc-config
-       |  +--rw spectrum
-       |  |  +--rw upper-frequency?        uint64
-       |  |  +--rw lower-frequency?        uint64
-       |  |  +--rw frequency-constraint
-       |  |     +--rw adjustment-granularity?   adjustment-granularity
-       |  |     +--rw grid-type?                grid-type
-       |  +--rw power-management-config-pac
-       |  |  +--rw intended-maximum-output-power
-       |  |  |  +--rw total-power?              decimal64
-       |  |  |  +--rw power-spectral-density?   decimal64
-       |  |  +--rw intended-minimum-output-power
-       |  |  |  +--rw total-power?              decimal64
-       |  |  |  +--rw power-spectral-density?   decimal64
-       |  |  +--rw expected-maximum-input-power
-       |  |  |  +--rw total-power?              decimal64
-       |  |  |  +--rw power-spectral-density?   decimal64
-       |  |  +--rw expected-minimum-input-power
-       |  |     +--rw total-power?              decimal64
-       |  |     +--rw power-spectral-density?   decimal64
-       |  +--rw local-id?                      string
-       |  +--rw name* [value-name]
-       |     +--rw value-name    string
-       |     +--rw value?        string
-       +--rw power-management-config
-          +--rw intended-maximum-output-power
-          |  +--rw total-power?              decimal64
-          |  +--rw power-spectral-density?   decimal64
-          +--rw intended-minimum-output-power
-          |  +--rw total-power?              decimal64
-          |  +--rw power-spectral-density?   decimal64
-          +--rw expected-maximum-input-power
-          |  +--rw total-power?              decimal64
-          |  +--rw power-spectral-density?   decimal64
-          +--rw expected-minimum-input-power
-             +--rw total-power?              decimal64
-             +--rw power-spectral-density?   decimal64
+          +--rw spectrum
+          |  +--rw upper-frequency?        uint64
+          |  +--rw lower-frequency?        uint64
+          |  +--rw frequency-constraint
+          |     +--rw adjustment-granularity?   adjustment-granularity
+          |     +--rw grid-type?                grid-type
+          +--rw power-management-config-pac
+          |  +--rw intended-maximum-output-power
+          |  |  +--rw total-power?              decimal64
+          |  |  +--rw power-spectral-density?   decimal64
+          |  +--rw intended-minimum-output-power
+          |  |  +--rw total-power?              decimal64
+          |  |  +--rw power-spectral-density?   decimal64
+          |  +--rw expected-maximum-input-power
+          |  |  +--rw total-power?              decimal64
+          |  |  +--rw power-spectral-density?   decimal64
+          |  +--rw expected-minimum-input-power
+          |     +--rw total-power?              decimal64
+          |     +--rw power-spectral-density?   decimal64
+          +--rw local-id?                      string
+          +--rw name* [value-name]
+             +--rw value-name    string
+             +--rw value?        string
   augment /tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point:
     +--ro media-channel-connection-end-point-spec
        +--ro media-channel
@@ -234,237 +217,159 @@ module: tapi-photonic-media
   augment /tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point:
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
-       |  +-- spectrum
-       |  |  +-- upper-frequency?        uint64
-       |  |  +-- lower-frequency?        uint64
-       |  |  +-- frequency-constraint
-       |  |     +-- adjustment-granularity?   adjustment-granularity
-       |  |     +-- grid-type?                grid-type
-       |  +-- power-management-config-pac
-       |  |  +-- intended-maximum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- intended-minimum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-maximum-input-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-minimum-input-power
-       |  |     +-- total-power?              decimal64
-       |  |     +-- power-spectral-density?   decimal64
-       |  +-- local-id?                      string
-       |  +-- name* [value-name]
-       |     +-- value-name    string
-       |     +-- value?        string
-       +-- power-management-config
-          +-- intended-maximum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- intended-minimum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-maximum-input-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-minimum-input-power
-             +-- total-power?              decimal64
-             +-- power-spectral-density?   decimal64
+          +-- spectrum
+          |  +-- upper-frequency?        uint64
+          |  +-- lower-frequency?        uint64
+          |  +-- frequency-constraint
+          |     +-- adjustment-granularity?   adjustment-granularity
+          |     +-- grid-type?                grid-type
+          +-- power-management-config-pac
+          |  +-- intended-maximum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- intended-minimum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-maximum-input-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-minimum-input-power
+          |     +-- total-power?              decimal64
+          |     +-- power-spectral-density?   decimal64
+          +-- local-id?                      string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
-       |  +-- spectrum
-       |  |  +-- upper-frequency?        uint64
-       |  |  +-- lower-frequency?        uint64
-       |  |  +-- frequency-constraint
-       |  |     +-- adjustment-granularity?   adjustment-granularity
-       |  |     +-- grid-type?                grid-type
-       |  +-- power-management-config-pac
-       |  |  +-- intended-maximum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- intended-minimum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-maximum-input-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-minimum-input-power
-       |  |     +-- total-power?              decimal64
-       |  |     +-- power-spectral-density?   decimal64
-       |  +-- local-id?                      string
-       |  +-- name* [value-name]
-       |     +-- value-name    string
-       |     +-- value?        string
-       +-- power-management-config
-          +-- intended-maximum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- intended-minimum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-maximum-input-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-minimum-input-power
-             +-- total-power?              decimal64
-             +-- power-spectral-density?   decimal64
+          +-- spectrum
+          |  +-- upper-frequency?        uint64
+          |  +-- lower-frequency?        uint64
+          |  +-- frequency-constraint
+          |     +-- adjustment-granularity?   adjustment-granularity
+          |     +-- grid-type?                grid-type
+          +-- power-management-config-pac
+          |  +-- intended-maximum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- intended-minimum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-maximum-input-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-minimum-input-power
+          |     +-- total-power?              decimal64
+          |     +-- power-spectral-density?   decimal64
+          +-- local-id?                      string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
-       |  +-- spectrum
-       |  |  +-- upper-frequency?        uint64
-       |  |  +-- lower-frequency?        uint64
-       |  |  +-- frequency-constraint
-       |  |     +-- adjustment-granularity?   adjustment-granularity
-       |  |     +-- grid-type?                grid-type
-       |  +-- power-management-config-pac
-       |  |  +-- intended-maximum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- intended-minimum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-maximum-input-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-minimum-input-power
-       |  |     +-- total-power?              decimal64
-       |  |     +-- power-spectral-density?   decimal64
-       |  +-- local-id?                      string
-       |  +-- name* [value-name]
-       |     +-- value-name    string
-       |     +-- value?        string
-       +-- power-management-config
-          +-- intended-maximum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- intended-minimum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-maximum-input-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-minimum-input-power
-             +-- total-power?              decimal64
-             +-- power-spectral-density?   decimal64
+          +-- spectrum
+          |  +-- upper-frequency?        uint64
+          |  +-- lower-frequency?        uint64
+          |  +-- frequency-constraint
+          |     +-- adjustment-granularity?   adjustment-granularity
+          |     +-- grid-type?                grid-type
+          +-- power-management-config-pac
+          |  +-- intended-maximum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- intended-minimum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-maximum-input-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-minimum-input-power
+          |     +-- total-power?              decimal64
+          |     +-- power-spectral-density?   decimal64
+          +-- local-id?                      string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point:
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
-       |  +-- spectrum
-       |  |  +-- upper-frequency?        uint64
-       |  |  +-- lower-frequency?        uint64
-       |  |  +-- frequency-constraint
-       |  |     +-- adjustment-granularity?   adjustment-granularity
-       |  |     +-- grid-type?                grid-type
-       |  +-- power-management-config-pac
-       |  |  +-- intended-maximum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- intended-minimum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-maximum-input-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-minimum-input-power
-       |  |     +-- total-power?              decimal64
-       |  |     +-- power-spectral-density?   decimal64
-       |  +-- local-id?                      string
-       |  +-- name* [value-name]
-       |     +-- value-name    string
-       |     +-- value?        string
-       +-- power-management-config
-          +-- intended-maximum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- intended-minimum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-maximum-input-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-minimum-input-power
-             +-- total-power?              decimal64
-             +-- power-spectral-density?   decimal64
+          +-- spectrum
+          |  +-- upper-frequency?        uint64
+          |  +-- lower-frequency?        uint64
+          |  +-- frequency-constraint
+          |     +-- adjustment-granularity?   adjustment-granularity
+          |     +-- grid-type?                grid-type
+          +-- power-management-config-pac
+          |  +-- intended-maximum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- intended-minimum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-maximum-input-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-minimum-input-power
+          |     +-- total-power?              decimal64
+          |     +-- power-spectral-density?   decimal64
+          +-- local-id?                      string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
-       |  +-- spectrum
-       |  |  +-- upper-frequency?        uint64
-       |  |  +-- lower-frequency?        uint64
-       |  |  +-- frequency-constraint
-       |  |     +-- adjustment-granularity?   adjustment-granularity
-       |  |     +-- grid-type?                grid-type
-       |  +-- power-management-config-pac
-       |  |  +-- intended-maximum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- intended-minimum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-maximum-input-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-minimum-input-power
-       |  |     +-- total-power?              decimal64
-       |  |     +-- power-spectral-density?   decimal64
-       |  +-- local-id?                      string
-       |  +-- name* [value-name]
-       |     +-- value-name    string
-       |     +-- value?        string
-       +-- power-management-config
-          +-- intended-maximum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- intended-minimum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-maximum-input-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-minimum-input-power
-             +-- total-power?              decimal64
-             +-- power-spectral-density?   decimal64
+          +-- spectrum
+          |  +-- upper-frequency?        uint64
+          |  +-- lower-frequency?        uint64
+          |  +-- frequency-constraint
+          |     +-- adjustment-granularity?   adjustment-granularity
+          |     +-- grid-type?                grid-type
+          +-- power-management-config-pac
+          |  +-- intended-maximum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- intended-minimum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-maximum-input-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-minimum-input-power
+          |     +-- total-power?              decimal64
+          |     +-- power-spectral-density?   decimal64
+          +-- local-id?                      string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point:
     +-- media-channel-connectivity-service-end-point-spec
        +-- mc-config
-       |  +-- spectrum
-       |  |  +-- upper-frequency?        uint64
-       |  |  +-- lower-frequency?        uint64
-       |  |  +-- frequency-constraint
-       |  |     +-- adjustment-granularity?   adjustment-granularity
-       |  |     +-- grid-type?                grid-type
-       |  +-- power-management-config-pac
-       |  |  +-- intended-maximum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- intended-minimum-output-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-maximum-input-power
-       |  |  |  +-- total-power?              decimal64
-       |  |  |  +-- power-spectral-density?   decimal64
-       |  |  +-- expected-minimum-input-power
-       |  |     +-- total-power?              decimal64
-       |  |     +-- power-spectral-density?   decimal64
-       |  +-- local-id?                      string
-       |  +-- name* [value-name]
-       |     +-- value-name    string
-       |     +-- value?        string
-       +-- power-management-config
-          +-- intended-maximum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- intended-minimum-output-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-maximum-input-power
-          |  +-- total-power?              decimal64
-          |  +-- power-spectral-density?   decimal64
-          +-- expected-minimum-input-power
-             +-- total-power?              decimal64
-             +-- power-spectral-density?   decimal64
+          +-- spectrum
+          |  +-- upper-frequency?        uint64
+          |  +-- lower-frequency?        uint64
+          |  +-- frequency-constraint
+          |     +-- adjustment-granularity?   adjustment-granularity
+          |     +-- grid-type?                grid-type
+          +-- power-management-config-pac
+          |  +-- intended-maximum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- intended-minimum-output-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-maximum-input-power
+          |  |  +-- total-power?              decimal64
+          |  |  +-- power-spectral-density?   decimal64
+          |  +-- expected-minimum-input-power
+          |     +-- total-power?              decimal64
+          |     +-- power-spectral-density?   decimal64
+          +-- local-id?                      string
+          +-- name* [value-name]
+             +-- value-name    string
+             +-- value?        string
   augment /tapi-topology:get-node-edge-point-details/tapi-topology:output/tapi-topology:node-edge-point:
     +-- media-channel-node-edge-point-spec
        +--ro mc-pool
@@ -725,20 +630,16 @@ module: tapi-photonic-media
   augment /tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip:
     +-- otsi-service-interface-point-spec
        +--ro otsi-capability
-       |  +--ro supportable-lower-central-frequency* [central-frequency]
+       |  +--ro supportable-central-frequency-spectrum-band* [lower-central-frequency upper-central-frequency]
+       |  |  +--ro lower-central-frequency    uint64
+       |  |  +--ro upper-central-frequency    uint64
        |  |  +--ro frequency-constraint
-       |  |  |  +--ro adjustment-granularity?   adjustment-granularity
-       |  |  |  +--ro grid-type?                grid-type
-       |  |  +--ro central-frequency       uint64
-       |  +--ro supportable-upper-central-frequency* [central-frequency]
-       |  |  +--ro frequency-constraint
-       |  |  |  +--ro adjustment-granularity?   adjustment-granularity
-       |  |  |  +--ro grid-type?                grid-type
-       |  |  +--ro central-frequency       uint64
+       |  |     +--ro adjustment-granularity?   adjustment-granularity
+       |  |     +--ro grid-type?                grid-type
        |  +--ro supportable-application-identifier* [application-code]
        |  |  +--ro application-identifier-type?   application-identifier-type
        |  |  +--ro application-code               string
-       |  +--ro supportable-modulation*                modulation-technique
+       |  +--ro supportable-modulation*                        modulation-technique
        |  +--ro total-power-warn-threshold
        |     +--ro total-power-upper-warn-threshold-default?   decimal64
        |     +--ro total-power-upper-warn-threshold-min?       decimal64
@@ -762,20 +663,16 @@ module: tapi-photonic-media
   augment /tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip:
     +-- otsi-service-interface-point-spec
        +--ro otsi-capability
-       |  +--ro supportable-lower-central-frequency* [central-frequency]
-       |  |  +--ro frequency-constraint
-       |  |  |  +--ro adjustment-granularity?   adjustment-granularity
-       |  |  |  +--ro grid-type?                grid-type
-       |  |  +--ro central-frequency       uint64
-       |  +--ro supportable-upper-central-frequency* [central-frequency]
+       |  +--ro supportable-central-frequency-spectrum-band* [lower-central-frequency upper-central-frequency]
+       |  |  +--ro lower-central-frequency    uint64
+       |  |  +--ro upper-central-frequency    uint64
        |  |  +--ro frequency-constraint
-       |  |  |  +--ro adjustment-granularity?   adjustment-granularity
-       |  |  |  +--ro grid-type?                grid-type
-       |  |  +--ro central-frequency       uint64
+       |  |     +--ro adjustment-granularity?   adjustment-granularity
+       |  |     +--ro grid-type?                grid-type
        |  +--ro supportable-application-identifier* [application-code]
        |  |  +--ro application-identifier-type?   application-identifier-type
        |  |  +--ro application-code               string
-       |  +--ro supportable-modulation*                modulation-technique
+       |  +--ro supportable-modulation*                        modulation-technique
        |  +--ro total-power-warn-threshold
        |     +--ro total-power-upper-warn-threshold-default?   decimal64
        |     +--ro total-power-upper-warn-threshold-min?       decimal64
@@ -852,7 +749,7 @@ module: tapi-photonic-media
              +--ro laser-bias-current?       decimal64
              +--ro laser-temperature?        decimal64
   augment /tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point:
-    +--rw otsi-aconnectivity-service-end-point-spec
+    +--rw otsia-connectivity-service-end-point-spec
        +--rw otsi-config* [local-id]
        |  +--rw central-frequency
        |  |  +--rw frequency-constraint
@@ -881,7 +778,7 @@ module: tapi-photonic-media
        |     +--rw value?        string
        +--rw number-of-otsi?   uint64
   augment /tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point:
-    +--rw media-channel-aconnectivity-service-end-point-spec
+    +--rw mca-connectivity-service-end-point-spec
        +--rw mc-config* [local-id]
        |  +--rw spectrum
        |  |  +--rw upper-frequency?        uint64
diff --git a/YANG/tapi-photonic-media@2020-04-23.yang b/YANG/tapi-photonic-media@2020-06-16.yang
similarity index 94%
rename from YANG/tapi-photonic-media@2020-04-23.yang
rename to YANG/tapi-photonic-media@2020-06-16.yang
index 97972523..ca6ba8da 100644
--- a/YANG/tapi-photonic-media@2020-04-23.yang
+++ b/YANG/tapi-photonic-media@2020-06-16.yang
@@ -33,7 +33,7 @@ module tapi-photonic-media {
           YANG models included in this release may not be backward compatible with previous TAPI releases.
         Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.
         License: This module is distributed under the Apache License 2.0";
-    revision 2020-04-23 {
+    revision 2020-06-16 {
         description "ONF Transport API version 2.1.3.
                    - OtsiConnectivityServiceEndPointSpec class, deprecated
                    - New OtsiAConnectivityServiceEndPointSpec, with numberOfOTSi property (integer).
@@ -305,15 +305,15 @@ module tapi-photonic-media {
         description "none";
     }
     augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {
-        container otsi-aconnectivity-service-end-point-spec {
-            uses otsi-aconnectivity-service-end-point-spec;
+        container otsia-connectivity-service-end-point-spec {
+            uses otsia-connectivity-service-end-point-spec;
             description "none";
         }
         description "none";
     }
     augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {
-        container media-channel-aconnectivity-service-end-point-spec {
-            uses media-channel-aconnectivity-service-end-point-spec;
+        container mca-connectivity-service-end-point-spec {
+            uses mca-connectivity-service-end-point-spec;
             description "none";
         }
         description "none";
@@ -442,17 +442,14 @@ module tapi-photonic-media {
         description "none";
     }
     grouping otsi-capability-pac {
-        list supportable-lower-central-frequency {
-            key 'central-frequency';
+        list supportable-central-frequency-spectrum-band {
+            key 'lower-central-frequency upper-central-frequency';
             config false;
-            uses central-frequency;
-            description "The lower frequency of the channel spectrum";
-        }
-        list supportable-upper-central-frequency {
-            key 'central-frequency';
-            config false;
-            uses central-frequency;
-            description "The Upper frequency of the channel spectrum";
+            uses central-frequency-band;
+            description "Each spectrum band supported for otsi trasmitter to be tuned on,
+                is specified as per it's lower and upper central frequencies supported and its frequency constraints,
+                consisting in the frequency Grid and the AdjustmentGranularity,
+                used to uniquely identify all central frequencies supported within the band.";
         }
         list supportable-application-identifier {
             key 'application-code';
@@ -582,10 +579,6 @@ module tapi-photonic-media {
             uses media-channel-config-pac;
             description "none";
         }
-        container power-management-config {
-            uses power-management-config-pac;
-            description "none";
-        }
         description "none";
     }
     grouping media-channel-config-pac {
@@ -748,7 +741,7 @@ module tapi-photonic-media {
         }
         description "none";
     }
-    grouping media-channel-aconnectivity-service-end-point-spec {
+    grouping mca-connectivity-service-end-point-spec {
         list mc-config {
             key 'local-id';
             uses media-channel-config-pac;
@@ -774,7 +767,7 @@ module tapi-photonic-media {
             when OTSiMCA' ConnectivityService provisioning drives also creation of 'supporting' MCs.
             (*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.";
     }
-    grouping otsi-aconnectivity-service-end-point-spec {
+    grouping otsia-connectivity-service-end-point-spec {
         list otsi-config {
             key 'local-id';
             uses otsi-termination-config-pac;
@@ -1107,5 +1100,23 @@ module tapi-photonic-media {
         }
         description "none";
     }
+    grouping central-frequency-band {
+        leaf lower-central-frequency {
+            type uint64;
+            description "The lower central frequency that can be tuned in the laser specified in MHz.
+                It is the oscillation frequency of the corresponding electromagnetic wave. ";
+        }
+        leaf upper-central-frequency {
+            type uint64;
+            description "The upper central frequency that can be tuned in the laser specified in MHz.
+                It is the oscillation frequency of the corresponding electromagnetic wave. ";
+        }
+        container frequency-constraint {
+            uses frequency-constraint;
+            description "none";
+        }
+        description "This data-type represents a range of central frequency spectrum band specified as lower and upper bounds, inclusive of the bound values.
+            It also holds frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity.";
+    }
 
 }
diff --git a/YANG/tapi-streaming@2020-04-23.tree b/YANG/tapi-streaming@2020-06-16.tree
similarity index 100%
rename from YANG/tapi-streaming@2020-04-23.tree
rename to YANG/tapi-streaming@2020-06-16.tree
diff --git a/YANG/tapi-streaming@2020-04-23.yang b/YANG/tapi-streaming@2020-06-16.yang
similarity index 97%
rename from YANG/tapi-streaming@2020-04-23.yang
rename to YANG/tapi-streaming@2020-06-16.yang
index 5015f225..32700b91 100644
--- a/YANG/tapi-streaming@2020-04-23.yang
+++ b/YANG/tapi-streaming@2020-06-16.yang
@@ -45,7 +45,7 @@ module tapi-streaming {
         YANG models included in this release may not be backward compatible with previous TAPI releases.
         Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.
         License: This module is distributed under the Apache License 2.0.";
-    revision 2020-04-23 {
+    revision 2020-06-16 {
         description "ONF Transport API version 2.1.3.
                    - Comment typos corrected.
                    - One attribute changed (sourcePrecesion/source-precesion --> sourcePrecision/source-precision).
diff --git a/YANG/tapi-virtual-network@2020-04-23.tree b/YANG/tapi-virtual-network@2020-06-16.tree
similarity index 100%
rename from YANG/tapi-virtual-network@2020-04-23.tree
rename to YANG/tapi-virtual-network@2020-06-16.tree
diff --git a/YANG/tapi-virtual-network@2020-04-23.yang b/YANG/tapi-virtual-network@2020-06-16.yang
similarity index 97%
rename from YANG/tapi-virtual-network@2020-04-23.yang
rename to YANG/tapi-virtual-network@2020-06-16.yang
index 98065a05..978b05cf 100644
--- a/YANG/tapi-virtual-network@2020-04-23.yang
+++ b/YANG/tapi-virtual-network@2020-06-16.yang
@@ -30,7 +30,7 @@ module tapi-virtual-network {
         YANG models included in this release may not be backward compatible with previous TAPI releases.
         Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.
         License: This module is distributed under the Apache License 2.0.";
-    revision 2020-04-23 {
+    revision 2020-06-16 {
         description "ONF Transport API version 2.1.3.
                    - schedule type changed to tapi-common:time-range.
                    Changes included in this TAPI release (v2.1.3) are listed in